diff options
| author | Ville Syrjälä | 2015-05-05 16:17:38 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-05-21 23:23:40 +0200 |
| commit | 5a74f70a733fc79a37ee8462ae59de6897d17eed (patch) | |
| tree | 219eed66561001cff77d215845ce9c29bc255ec2 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Disable CRT port after pipe on PCH platforms (diff) | |
| download | kernel-qcow2-linux-5a74f70a733fc79a37ee8462ae59de6897d17eed.tar.gz kernel-qcow2-linux-5a74f70a733fc79a37ee8462ae59de6897d17eed.tar.xz kernel-qcow2-linux-5a74f70a733fc79a37ee8462ae59de6897d17eed.zip | |
drm/i915: Disable FDI RX/TX before the ports
Bspec says we should disable the FDI RX/TX before disabling the PCH
ports. Do so.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 52de4110c8e9..db665922edc2 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5111,13 +5111,14 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc) ironlake_pfit_disable(intel_crtc); + if (intel_crtc->config->has_pch_encoder) + ironlake_fdi_disable(crtc); + for_each_encoder_on_crtc(dev, crtc, encoder) if (encoder->post_disable) encoder->post_disable(encoder); if (intel_crtc->config->has_pch_encoder) { - ironlake_fdi_disable(crtc); - ironlake_disable_pch_transcoder(dev_priv, pipe); if (HAS_PCH_CPT(dev)) { |