drm/i915: Removed IVB forced enable of sprite dest key.
authoracreese <armin.c.reese@intel.com>
Wed, 4 Apr 2012 23:22:32 +0000 (16:22 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 9 Apr 2012 19:53:20 +0000 (21:53 +0200)
The destination color key is always enabled for IVB.  Removed
the line that does this.

Signed-off-by: Armin Reese <armin.c.reese@intel.com>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: stable@kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_sprite.c

index a464771a724070a229e917d7b7e5e249d1058845..e90dfb625c4201137d1b8a893fa99342904059d4 100644 (file)
@@ -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--;