drm/i915/backlight: Take luminance_set into account for VESA backlight

When deciding what functions to enable to help control backlight we
used to only check aux_enable. Now with PANEL_LUMINANCE_OVERRIDE in
picture we need to take care that we do not enable PWM function if
luminance_set is set.

Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/15671
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>
Link: https://patch.msgid.link/20260302040613.3324049-4-suraj.kandpal@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
index ca3e6b8eb3ecea1e5c5f43e012c06c527d0d0d59..b72535f893827f2d99d3ab74aa781a6b0994feae 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
@@ -486,7 +486,8 @@ intel_dp_aux_vesa_enable_backlight(const struct intel_crtc_state *crtc_state,
        struct intel_panel *panel = &connector->panel;
        struct intel_dp *intel_dp = enc_to_intel_dp(connector->encoder);
 
-       if (!panel->backlight.edp.vesa.info.aux_enable) {
+       if (!(panel->backlight.edp.vesa.info.aux_enable ||
+             panel->backlight.edp.vesa.info.luminance_set)) {
                u32 pwm_level;
 
                if (!panel->backlight.edp.vesa.info.aux_set)