[PATCH] drm/i915: Removed IVB forced enable of sprite dest key

[PATCH] drm/i915: Removed IVB forced enable of sprite dest key

[Reese, Armin C]

[-- Attachment #1.1: Type: text/plain, Size: 78 bytes --]

Prefixed the patch subject with 'drm/i915:'.  Nothing else changed.

Armin

[-- Attachment #1.2: Type: text/html, Size: 1851 bytes --]

[-- Attachment #2: destkey.patch --]
[-- Type: application/octet-stream, Size: 919 bytes --]

From 3a63c3f841309f989f36cb3301f51ea7b6447848 Mon Sep 17 00:00:00 2001
From: acreese <armin.c.reese@intel.com>
Date: Wed, 4 Apr 2012 16:22:32 -0700
Subject: [PATCH] drm/i915: Removed IVB forced enable of sprite dest key.

The destination color key is always enabled for IVB.  Removed
the line that does this.

Signed-off-by: acreese <armin.c.reese@intel.com>
---
 drivers/gpu/drm/i915/intel_sprite.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index c88be5f..122cf22 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -95,7 +95,6 @@ ivb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
 	/* must disable */
 	sprctl |= SPRITE_TRICKLE_FEED_DISABLE;
 	sprctl |= SPRITE_ENABLE;
-	sprctl |= SPRITE_DEST_KEY;
 
 	/* Sizes are 0 based */
 	src_w--;
-- 
1.7.4.1


[-- Attachment #3: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Removed IVB forced enable of sprite dest key

[Daniel Vetter]

On Thu, Apr 12, 2012 at 08:39:38PM +0000, Reese, Armin C wrote:
> Prefixed the patch subject with 'drm/i915:'.  Nothing else changed.

This one is aready merged into -fixes and on track to get merged into
3.4-rc3.
-Daniel

PS: You're called acreese in both the git commiter and sob line. You can
fix this with the user.name git option:

$ git config --global user.name "Armin Reese"

... should do the trick.
-- 
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48