[PATCH 27/66] drm/i915: Sprinkle intel_edp_psr_update over crtc_enable/disable

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

My plan here is to split up set_base into a prepare step, which does
the pinning, and a commit stage, which updates the hw state. Eventually
we should be able to move the prepare step at the beginning of any
atomic update. For now I only want to move the commit step into the
crtc_enable callbacks.

As a prep step sprinkle intel_edp_psr_update all over the place so
that we don't have to concern ourselves with that in the commit step.

v2: Rebase on top of Ville's enable/disable functions for all planes.

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

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2f46658d6d53..202b33817902 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3643,6 +3643,7 @@ static void ilk_crtc_enable_planes(struct drm_crtc *crtc)

mutex_lock(&dev->struct_mutex);
intel_update_fbc(dev);
+ intel_edp_psr_update(dev);
mutex_unlock(&dev->struct_mutex);

drm_vblank_on(dev, pipe);
@@ -3902,6 +3903,7 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc)

mutex_lock(&dev->struct_mutex);
intel_update_fbc(dev);
+ intel_edp_psr_update(dev);
mutex_unlock(&dev->struct_mutex);
}

@@ -3949,6 +3951,7 @@ static void haswell_crtc_disable(struct drm_crtc *crtc)

mutex_lock(&dev->struct_mutex);
intel_update_fbc(dev);
+ intel_edp_psr_update(dev);
mutex_unlock(&dev->struct_mutex);
}

@@ -4346,6 +4349,7 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc)

mutex_lock(&dev->struct_mutex);
intel_update_fbc(dev);
+ intel_edp_psr_update(dev);
mutex_unlock(&dev->struct_mutex);

for_each_encoder_on_crtc(dev, crtc, encoder)
@@ -4397,6 +4401,7 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc)

mutex_lock(&dev->struct_mutex);
intel_update_fbc(dev);
+ intel_edp_psr_update(dev);
mutex_unlock(&dev->struct_mutex);

for_each_encoder_on_crtc(dev, crtc, encoder)
@@ -4466,6 +4471,7 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc)

mutex_lock(&dev->struct_mutex);
intel_update_fbc(dev);
+ intel_edp_psr_update(dev);
mutex_unlock(&dev->struct_mutex);
}

--
1.8.1.4