[PATCH 26/66] drm/i915: More cargo-culted locking for intel_update_fbc

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

Just for consistency, this patch won't fix anything really.

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 b3bd25109ea3..2f46658d6d53 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4344,7 +4344,9 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc)
intel_enable_planes(crtc);
intel_crtc_update_cursor(crtc, true);

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

for_each_encoder_on_crtc(dev, crtc, encoder)
encoder->enable(encoder);
@@ -4393,7 +4395,9 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc)
/* Give the overlay scaler a chance to enable if it's on this pipe */
intel_crtc_dpms_overlay(intel_crtc, true);

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

for_each_encoder_on_crtc(dev, crtc, encoder)
encoder->enable(encoder);
@@ -4460,7 +4464,9 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc)
intel_crtc->active = false;
intel_update_watermarks(crtc);

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

static void i9xx_crtc_off(struct drm_crtc *crtc)
--
1.8.1.4