We just return when using luminance control instead we should be calling the disable helper to get everything cleaned up properly.
Signed-off-by: Suraj Kandpal <suraj.kand...@intel.com> --- drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 12084a542fc5..7306858467fe 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c +++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c @@ -508,10 +508,10 @@ static void intel_dp_aux_vesa_disable_backlight(const struct drm_connector_state struct intel_panel *panel = &connector->panel; struct intel_dp *intel_dp = enc_to_intel_dp(connector->encoder); - if (panel->backlight.edp.vesa.luminance_control_support) + if (panel->backlight.edp.vesa.luminance_control_support) { + drm_edp_backlight_disable(&intel_dp->aux, &panel->backlight.edp.vesa.info); return; - - drm_edp_backlight_disable(&intel_dp->aux, &panel->backlight.edp.vesa.info); + } if (!panel->backlight.edp.vesa.info.aux_enable) panel->backlight.pwm_funcs->disable(old_conn_state, -- 2.34.1