Commit 5234105e authored by Jouni Högander's avatar Jouni Högander
Browse files

drm/i915/display: Move invert_brightness module parameter under display 



Signed-off-by: default avatarJouni Högander <jouni.hogander@intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231024124109.384973-15-jouni.hogander@intel.com
parent c39fc2ac

drivers/gpu/drm/i915/display/intel_backlight.c

+5 −4
Original line number Diff line number Diff line
@@ -88,10 +88,10 @@ u32 intel_backlight_invert_pwm_level(struct intel_connector *connector, u32 val) 


	drm_WARN_ON(&i915->drm, panel->backlight.pwm_level_max == 0);



	if (i915->params.invert_brightness < 0)

	if (i915->display.params.invert_brightness < 0)

		return val;



	if (i915->params.invert_brightness > 0 ||

	if (i915->display.params.invert_brightness > 0 ||

	    intel_has_quirk(i915, QUIRK_INVERT_BRIGHTNESS)) {

		return panel->backlight.pwm_level_max - val + panel->backlight.pwm_level_min;

	}
@@ -132,8 +132,9 @@ u32 intel_backlight_level_from_pwm(struct intel_connector *connector, u32 val) 
	drm_WARN_ON_ONCE(&i915->drm,

			 panel->backlight.max == 0 || panel->backlight.pwm_level_max == 0);



	if (i915->params.invert_brightness > 0 ||

	    (i915->params.invert_brightness == 0 && intel_has_quirk(i915, QUIRK_INVERT_BRIGHTNESS)))

	if (i915->display.params.invert_brightness > 0 ||

	    (i915->display.params.invert_brightness == 0 &&

	     intel_has_quirk(i915, QUIRK_INVERT_BRIGHTNESS)))

		val = panel->backlight.pwm_level_max - (val - panel->backlight.pwm_level_min);



	return scale(val, panel->backlight.pwm_level_min, panel->backlight.pwm_level_max,

drivers/gpu/drm/i915/display/intel_display_params.c

+7 −0
Original line number Diff line number Diff line
@@ -59,6 +59,13 @@ intel_display_param_named_unsafe(disable_power_well, int, 0400, 


intel_display_param_named_unsafe(enable_ips, bool, 0400, "Enable IPS (default: true)");



intel_display_param_named_unsafe(invert_brightness, int, 0400,

	"Invert backlight brightness "

	"(-1 force normal, 0 machine defaults, 1 force inversion), please "

	"report PCI device ID, subsystem vendor and subsystem device ID "

	"to dri-devel@lists.freedesktop.org, if your machine needs it. "

	"It will then be included in an upcoming module version.");



intel_display_param_named_unsafe(enable_fbc, int, 0400,

	"Enable frame buffer compression for power savings "

	"(default: -1 (use per-chip default))");

drivers/gpu/drm/i915/display/intel_display_params.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ struct drm_i915_private; 
	param(bool, enable_sagv, true, 0600) \

	param(int, disable_power_well, -1, 0400) \

	param(bool, enable_ips, true, 0600) \

	param(int, invert_brightness, 0, 0600) \

	param(int, enable_fbc, -1, 0600) \

	param(int, enable_psr, -1, 0600) \

	param(bool, psr_safest_params, false, 0400) \

drivers/gpu/drm/i915/i915_params.c

+0 −7
Original line number Diff line number Diff line
@@ -94,13 +94,6 @@ i915_param_named_unsafe(force_reset_modeset_test, bool, 0400, 
	"Force a modeset during gpu reset for testing (default:false). "

	"For developers only.");



i915_param_named_unsafe(invert_brightness, int, 0400,

	"Invert backlight brightness "

	"(-1 force normal, 0 machine defaults, 1 force inversion), please "

	"report PCI device ID, subsystem vendor and subsystem device ID "

	"to dri-devel@lists.freedesktop.org, if your machine needs it. "

	"It will then be included in an upcoming module version.");



i915_param_named(disable_display, bool, 0400,

	"Disable display (default: false)");

drivers/gpu/drm/i915/i915_params.h

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ struct drm_printer; 
 */

#define I915_PARAMS_FOR_EACH(param) \

	param(int, modeset, -1, 0400) \

	param(int, invert_brightness, 0, 0600) \

	param(int, enable_guc, -1, 0400) \

	param(int, guc_log_level, -1, 0400) \

	param(char *, guc_firmware_path, NULL, 0400) \