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

Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231024124109.384973-15-jouni.hogander@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_backlight.c b/drivers/gpu/drm/i915/display/intel_backlight.c
index 2e8f17c04522237500448f4c67328047b9ca63e2..612d4cd9dacbac03c3bab57012c2229b7fbfff4e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_backlight.c
+++ b/drivers/gpu/drm/i915/display/intel_backlight.c
@@ -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,

diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c b/drivers/gpu/drm/i915/display/intel_display_params.c
index ce991ad2000618f0382b21ef45e34e735e376826..2d721afaba3026288c059dd4e29a926cad187ec1 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_params.c
+++ b/drivers/gpu/drm/i915/display/intel_display_params.c
@@ -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))");

diff --git a/drivers/gpu/drm/i915/display/intel_display_params.h b/drivers/gpu/drm/i915/display/intel_display_params.h
index 8d51488e3b3e62b3c519a961ebfdbd19f115beab..4723b45224134d6c6b4f1ea48a0995987ed672b7 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_params.h
+++ b/drivers/gpu/drm/i915/display/intel_display_params.h
@@ -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) \

diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 54dcce97da2aff187e767aa2e46af1d6d6de3c65..423fe54484e10bad0b5ef072b60b5529d2e56ee3 100644 (file)
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -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)");
 

diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index 18bb8a93e0e8566518c418df97bd71762437fdcf..ae0873443a655976a079f393ebb39e28364107bf 100644 (file)
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -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) \