diff options
| author | Keith Packard <keithp@keithp.com> | 2011-11-01 19:54:11 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-11-16 20:26:26 -0800 |
| commit | 417e822deee1d2bcd8a8a60660c40a0903713f2b (patch) | |
| tree | cdd0aa71a0ea4392a6b3be49237eadc201d69903 /drivers/gpu/drm/i915/intel_display.c | |
| parent | 93f62dad5ffe0962d83772fd16c0c1a9dd69767d (diff) | |
| download | lwn-417e822deee1d2bcd8a8a60660c40a0903713f2b.tar.gz lwn-417e822deee1d2bcd8a8a60660c40a0903713f2b.zip | |
drm/i915: Treat PCH eDP like DP in most places
PCH eDP has many of the same needs as regular PCH DP connections,
including the DP_CTl bit settings, the TRANS_DP_CTL register.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 591eb0ed3110..e77a863a3833 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2933,7 +2933,8 @@ static void ironlake_pch_enable(struct drm_crtc *crtc) /* For PCH DP, enable TRANS_DP_CTL */ if (HAS_PCH_CPT(dev) && - intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT)) { + (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT) || + intel_pipe_has_type(crtc, INTEL_OUTPUT_EDP))) { u32 bpc = (I915_READ(PIPECONF(pipe)) & PIPE_BPC_MASK) >> 5; reg = TRANS_DP_CTL(pipe); temp = I915_READ(reg); |