[PATCH 47/66] drm/i915: Move pch fifo underrun report enabling to hsw_crt_pre_enable

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

With this all the pch pre-enable work has been moved into the special
hsw crt encoder functions.

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

diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 2d8f4fe1b450..d3cae57d942a 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -275,6 +275,10 @@ static void hsw_fdi_link_train(struct drm_crtc *crtc)

static void hsw_crt_pre_enable(struct intel_encoder *encoder)
{
+ struct drm_device *dev = encoder->base.dev;
+
+ intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_A, true);
+
hsw_fdi_link_train(encoder->base.crtc);
}

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 80b34ac31d0a..43a40594841f 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3855,8 +3855,6 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
intel_crtc->active = true;

intel_set_cpu_fifo_underrun_reporting(dev, pipe, true);
- if (intel_crtc->config.has_pch_encoder)
- intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_A, true);

for_each_encoder_on_crtc(dev, crtc, encoder)
if (encoder->pre_enable)
--
1.8.1.4