| From 5bebae6523fd44f62688483c254fc380a0804000 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> |
| Date: Tue, 1 Oct 2013 18:02:21 +0300 |
| Subject: drm/i915: Flush primary plane changes in sprite code |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| Flush the primary plane changes when enabling/disabling the primary |
| plane in response to sprite visibility. |
| |
| Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 0fc9f5996340a637665ccb4faa69aab498dc4067) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_sprite.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c |
| index 76d0e2f5c4aa..e001d2c35c39 100644 |
| --- a/drivers/gpu/drm/i915/intel_sprite.c |
| +++ b/drivers/gpu/drm/i915/intel_sprite.c |
| @@ -527,6 +527,7 @@ intel_enable_primary(struct drm_crtc *crtc) |
| intel_crtc->primary_disabled = false; |
| |
| I915_WRITE(reg, I915_READ(reg) | DISPLAY_PLANE_ENABLE); |
| + intel_flush_primary_plane(dev_priv, intel_crtc->plane); |
| |
| /* |
| * FIXME IPS should be fine as long as one plane is |
| @@ -571,6 +572,7 @@ intel_disable_primary(struct drm_crtc *crtc) |
| hsw_disable_ips(intel_crtc); |
| |
| I915_WRITE(reg, I915_READ(reg) & ~DISPLAY_PLANE_ENABLE); |
| + intel_flush_primary_plane(dev_priv, intel_crtc->plane); |
| } |
| |
| static int |
| -- |
| 1.8.5.rc3 |
| |
