drm/i915: add PANEL_UNLOCK_REGS definition
Subsystems (2)
PATCH 1/2 drm/i915: add PANEL_UNLOCK_REGS definition
In some cases, unlocking the panel regs is safe and can help us avoid a flickery, full mode set sequence. So define the unlock key and use it.
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_display.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -2805,6 +2805,7 @@#define PCH_PP_STATUS 0xc7200#define PCH_PP_CONTROL 0xc7204 +#define PANEL_UNLOCK_REGS (0xabcd << 16)#define EDP_FORCE_VDD (1 << 3)#define EDP_BLC_ENABLE (1 << 2)#define PANEL_POWER_RESET (1 << 1)
drivers/gpu/drm/i915/intel_display.c +4 -2
@@ -4644,7 +4644,8 @@ static void intel_increase_pllclock(struct drm_crtc *crtc, bool schedule)DRM_DEBUG_DRIVER ("upclocking LVDS\n" );/* Unlock panel regs */ -I915_WRITE (PP_CONTROL ,I915_READ (PP_CONTROL ) | (0xabcd <<16 )); +I915_WRITE (PP_CONTROL ,I915_READ (PP_CONTROL ) | +PANEL_UNLOCK_REGS ); dpll &= ~DISPLAY_RATE_SELECT_FPA1 ;I915_WRITE (dpll_reg, dpll);
@@ -4687,7 +4688,8 @@ static void intel_decrease_pllclock(struct drm_crtc *crtc)DRM_DEBUG_DRIVER ("downclocking LVDS\n" );/* Unlock panel regs */ -I915_WRITE (PP_CONTROL ,I915_READ (PP_CONTROL ) | (0xabcd <<16 )); +I915_WRITE (PP_CONTROL ,I915_READ (PP_CONTROL ) | +PANEL_UNLOCK_REGS ); dpll |=DISPLAY_RATE_SELECT_FPA1 ;I915_WRITE (dpll_reg, dpll);
Signature · 1 line
1.7.1
PATCH 2/2 drm/i915: make sure eDP panel is turned on
When enabling the eDP port, we need to make sure the panel is turned on after training the link. If we don't, it likely won't come back after suspend or may not come up at all.
For unknown reasons, unlocking the panel regs before initiating a power on sequence is necessary. There are known bugs in the PCH panel sequencing logic, apparently this is one possible workaround.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=28739.
--- drivers/gpu/drm/i915/intel_dp.c | 53 +++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +51 -2
@@ -744,6 +744,51 @@ intel_dp_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, } } +static void ironlake_edp_panel_on (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +unsigned long timeout = jiffies +msecs_to_jiffies (5000 ); +u32 pp, pp_status; + + pp_status =I915_READ (PCH_PP_STATUS ); +if (pp_status &PP_ON ) +return ; + + pp =I915_READ (PCH_PP_CONTROL ); + pp |=PANEL_UNLOCK_REGS |POWER_TARGET_ON ; +I915_WRITE (PCH_PP_CONTROL , pp); +do { + pp_status =I915_READ (PCH_PP_STATUS ); + }while (((pp_status &PP_ON ) ==0 ) && !time_after (jiffies, timeout)); + +if (time_after (jiffies, timeout)) +DRM_DEBUG_KMS ("panel on wait timed out: 0x%08x\n" , pp_status); + + pp &= ~(PANEL_UNLOCK_REGS |EDP_FORCE_VDD ); +I915_WRITE (PCH_PP_CONTROL , pp); +} + +static void ironlake_edp_panel_off (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +unsigned long timeout = jiffies +msecs_to_jiffies (5000 ); +u32 pp, pp_status; + + pp =I915_READ (PCH_PP_CONTROL ); + pp &= ~POWER_TARGET_ON ; +I915_WRITE (PCH_PP_CONTROL , pp); +do { + pp_status =I915_READ (PCH_PP_STATUS ); + }while ((pp_status &PP_ON ) && !time_after (jiffies, timeout)); + +if (time_after (jiffies, timeout)) +DRM_DEBUG_KMS ("panel off wait timed out\n" ); + +/* Make sure VDD is enabled so DP AUX will work */ + pp |=EDP_FORCE_VDD ; +I915_WRITE (PCH_PP_CONTROL , pp); +} +static void ironlake_edp_backlight_on (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -778,14 +823,18 @@ intel_dp_dpms(struct drm_encoder *encoder, int mode)if (mode !=DRM_MODE_DPMS_ON ) {if (dp_reg &DP_PORT_EN ) {intel_dp_link_down (intel_encoder, dp_priv->DP); -if (IS_eDP (intel_encoder) ||IS_PCH_eDP (dp_priv)) +if (IS_eDP (intel_encoder) ||IS_PCH_eDP (dp_priv)) {ironlake_edp_backlight_off (dev); +ironlake_edp_panel_off (dev); + } } }else {if (!(dp_reg &DP_PORT_EN )) {intel_dp_link_train (intel_encoder, dp_priv->DP, dp_priv->link_configuration); -if (IS_eDP (intel_encoder) ||IS_PCH_eDP (dp_priv)) +if (IS_eDP (intel_encoder) ||IS_PCH_eDP (dp_priv)) { +ironlake_edp_panel_on (dev);ironlake_edp_backlight_on (dev); + } } } dp_priv->dpms_mode = mode;
Signature · 1 line
1.7.1
Re: [PATCH 2/2] drm/i915: make sure eDP panel is turned on
Quoted 4 lines · On Thu, 22 Jul 2010 13:18:19 -0700 Jesse Barnes <[email protected]>…
When enabling the eDP port, we need to make sure the panel is turned on after training the link. If we don't, it likely won't come back after suspend or may not come up at all.
Quoted 8 lines
For unknown reasons, unlocking the panel regs before initiating a power on sequence is necessary. There are known bugs in the PCH panel sequencing logic, apparently this is one possible workaround.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=28739.
Signed-off-by Jesse Barnes <[email protected]>---
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
Eric Anholt
AppliedRe: [PATCH 2/2] drm/i915: make sure eDP panel is turned on
Quoted 11 lines · Jesse Barnes
Quoted 8 lines · On Thu, 22 Jul 2010 13:18:19 -0700 Jesse Barnes <[email protected]>…
When enabling the eDP port, we need to make sure the panel is turned on after training the link. If we don't, it likely won't come back after suspend or may not come up at all.
For unknown reasons, unlocking the panel regs before initiating a power on sequence is necessary. There are known bugs in the PCH panel sequencing logic, apparently this is one possible workaround.
Quoted 6 lines
Quoted 4 lines
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=28739.
Signed-off-by Jesse Barnes <[email protected]>---
Tested-by "Paulo J. S. Silva" <[email protected]>
Applied to for-linus.
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx