git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.4-rc3' into drm-intel-next-queued
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
i915
/
intel_sprite.c
diff --git
a/drivers/gpu/drm/i915/intel_sprite.c
b/drivers/gpu/drm/i915/intel_sprite.c
index
749d043
..
987800a
100644
(file)
--- 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--;