summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authoracreese <armin.c.reese@intel.com>2012-04-04 16:22:32 -0700
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-04-09 21:53:20 +0200
commitb2a71642b8bfa1965700ba248a99016e4d6b685d (patch)
treecdde642d5df7ebb2affea5b76f5de79508b6f1d1 /drivers
parent0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff)
downloadblackbird-op-linux-b2a71642b8bfa1965700ba248a99016e4d6b685d.tar.gz
blackbird-op-linux-b2a71642b8bfa1965700ba248a99016e4d6b685d.zip
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: 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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_sprite.c1
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 a464771a7240..e90dfb625c42 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--;
OpenPOWER on IntegriCloud