On Mon, 2023-10-16 at 14:16 +0300, Jouni Högander wrote:
> Signed-off-by: Jouni Högander <jouni.hogander@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_backlight.c | 9 +++++----
> drivers/gpu/drm/i915/display/intel_display_params.c | 9 ++++++++-
> drivers/gpu/drm/i915/display/intel_display_params.h | 1 +
> drivers/gpu/drm/i915/i915_params.c | 7 -------
> drivers/gpu/drm/i915/i915_params.h | 1 -
> 5 files changed, 14 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_backlight.c b/drivers/gpu/drm/i915/display/intel_backlight.c
> index 2e8f17c04522..612d4cd9dacb 100644
> --- 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 c2399e11203c..8d8050a22bf7 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_params.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_params.c
> @@ -57,7 +57,14 @@ intel_display_param_named_unsafe(disable_power_well, int, 0400,
> "Disable display power wells when possible "
> "(-1=auto [default], 0=power wells always on, 1=power wells disabled when possible)");
>
> -i915_param_named_unsafe(enable_ips, int, 0400, "Enable IPS (default: true)");
> +intel_display_param_named_unsafe(enable_ips, int, 0400, "Enable IPS (default: true)");
> +
This change is in the wrong patch. It should be moved to the previous
one.
With this fixed:
Reviewed-by: Luca Coelho <luciano.coelho@xxxxxxxxx>
--
Cheers,
Luca.
