drm/i915: Set the transcoder port to none when disabling DP.
Subsystems (2)
PATCH 1/1 drm/i915: Set the transcoder port to none when disabling DP.
The specs say to do so.
Signed-off-by Eric Anholt <[email protected]>
---
This patch is not actually tested, it was just left in my tree from rebasing it around since its previous submission. The change in this version is that the NONE is actually the correct value (3, not 2).
drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_display.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -3245,6 +3245,7 @@#define TRANS_DP_PORT_SEL_B (0<<29)#define TRANS_DP_PORT_SEL_C (1<<29)#define TRANS_DP_PORT_SEL_D (2<<29) +#define TRANS_DP_PORT_SEL_NONE (3<<29)#define TRANS_DP_PORT_SEL_MASK (3<<29)#define TRANS_DP_AUDIO_ONLY (1<<26)#define TRANS_DP_ENH_FRAMING (1<<18)
drivers/gpu/drm/i915/intel_display.c +1 -0
@@ -2818,6 +2818,7 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc) reg =TRANS_DP_CTL (pipe); temp =I915_READ (reg); temp &= ~(TRANS_DP_OUTPUT_ENABLE |TRANS_DP_PORT_SEL_MASK ); + temp |=TRANS_DP_PORT_SEL_NONE ;I915_WRITE (reg, temp);/* disable DPLL_SEL */
Signature · 1 line
1.7.2.3
Quoted 1 line · Eric Anholt
The specs say to do so.
Thanks Eric, applied to -next where we can give it some testing before it hits Linus.
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre