[PATCH 52/66] drm/i915: Move pch fifo underrun report re-enabling into hsw_crt_post_disable

Daniel Vetter
2014-04-24T21:57:04Z

Step 2 in pimping the hsw_crt_post_disable hook.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/intel_crt.c | 2 ++
drivers/gpu/drm/i915/intel_display.c | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 208f54f28d08..7a146f6d8c39 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -378,6 +378,8 @@ static void hsw_crt_post_disable(struct intel_encoder *encoder)
struct drm_i915_private *dev_priv = dev->dev_private;

lpt_disable_pch_transcoder(dev_priv);
+
+ intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_A, true);
}

static void intel_enable_crt(struct intel_encoder *encoder)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0e2c9f242b4d..b370817f787f 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3840,7 +3840,6 @@ static void haswell_crtc_disable(struct drm_crtc *crtc)
encoder->post_disable(encoder);

if (intel_crtc->config.has_pch_encoder) {
- intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_A, true);
intel_ddi_fdi_disable(crtc);
}

--
1.8.1.4