[PATCH 3/7][SRU][OEM-OSP1-B] drm/i915: Fix DPCD register order in intel_dp_aux_enable_backlight()

AceLan Kao acelan.kao at canonical.com
Thu Dec 12 09:07:34 UTC 2019

From: Lyude Paul <lyude at redhat.com>

BugLink: https://bugs.launchpad.net/bugs/1856134

For eDP panels, it appears it's expected that so long as the panel is in
DPCD control mode that the brightness value is never set to 0. Instead,
if the desired effect is to set the panel's backlight to 0 we're
expected to simply turn off the backlight through the

We already do the latter correctly in intel_dp_aux_disable_backlight().
But, we make the mistake of writing the DPCD registers in the wrong
order when enabling the backlight in intel_dp_aux_enable_backlight()
since we currently enable the backlight through
DP_EDP_DISPLAY_CONTROL_REGISTER before writing the brightness level. On
the X1 Extreme 2nd Generation, this appears to have the potential of
confusing the panel in such a way that further attempts to set the
brightness don't actually change the backlight as expected and leave it
off. Presumably, this happens because the incorrect register writing
order briefly leaves the panel with DPCD mode enabled and a 0 brightness
level set.

So, reverse the order we write the DPCD registers when enabling the
panel backlight so that we write the brightness value first, and enable
the backlight second. This fix appears to be the final bit needed to get
the backlight on the ThinkPad X1 Extreme 2nd Generation's AMOLED screen

Signed-off-by: Lyude Paul <lyude at redhat.com>
Reviewed-by: Jani Nikula <jani.nikula at intel.com>
(backported from https://patchwork.freedesktop.org/patch/342164/?series=69914&rev=4)
Signed-off-by: AceLan Kao <acelan.kao at canonical.com>
 drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/intel_dp_aux_backlight.c
index 509c0b786497..97dc4bf41d18 100644
--- a/drivers/gpu/drm/i915/intel_dp_aux_backlight.c
+++ b/drivers/gpu/drm/i915/intel_dp_aux_backlight.c
@@ -204,8 +204,9 @@ static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_st
+	intel_dp_aux_set_backlight(conn_state,
+				   connector->panel.backlight.level);
 	set_aux_backlight_enable(intel_dp, true);
-	intel_dp_aux_set_backlight(conn_state, connector->panel.backlight.level);
 static void intel_dp_aux_disable_backlight(const struct drm_connector_state *old_conn_state)

More information about the kernel-team mailing list