diff mbox

drm/i915: mask tiled bit when updating ILK sprites

Message ID 1342183833-16344-1-git-send-email-conselvan2@gmail.com
State Accepted
Headers show

Commit Message

Ander Conselvan de Oliveira July 13, 2012, 12:50 p.m. UTC
From: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>

Or going from tiled to untiled may break.

Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
---
 drivers/gpu/drm/i915/intel_sprite.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Comments

Chris Wilson July 13, 2012, 1:26 p.m. UTC | #1
On Fri, 13 Jul 2012 15:50:33 +0300, Ander Conselvan de Oliveira <conselvan2@gmail.com> wrote:
> From: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> 
> Or going from tiled to untiled may break.
> 
> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
Daniel Vetter July 13, 2012, 3:06 p.m. UTC | #2
On Fri, Jul 13, 2012 at 02:26:54PM +0100, Chris Wilson wrote:
> On Fri, 13 Jul 2012 15:50:33 +0300, Ander Conselvan de Oliveira <conselvan2@gmail.com> wrote:
> > From: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> > 
> > Or going from tiled to untiled may break.
> > 
> > Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Queued for -next, thanks for the patch. For some odd reason I've thought
I've reviewed the other sprite implementations when I've merged Jesse's
identical fix for ivb. But alas, I've failed, thanks for catching this.
-Daniel
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 1a1483b..cc8df4d 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -234,6 +234,7 @@  ilk_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
 	dvscntr &= ~DVS_PIXFORMAT_MASK;
 	dvscntr &= ~DVS_RGB_ORDER_XBGR;
 	dvscntr &= ~DVS_YUV_BYTE_ORDER_MASK;
+	dvscntr &= ~DVS_TILED;
 
 	switch (fb->pixel_format) {
 	case DRM_FORMAT_XBGR8888: