Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna/video: Update sprite destination colorkey command 

The final version that was upstreamed differed from the original version
we implemented. The final version allows for both destination/source
colorkeying, but left the ddx out of date.

Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-08-27 18:57:54 +01:00
parent 6997c4c2bd
commit feae741b38
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/sna/sna_video_sprite.c
View File

@ -213,21 +213,23 @@ sna_video_sprite_show(struct sna *sna,
frame->height = tmp;
}
#if defined(DRM_I915_SET_SPRITE_DESTKEY)
#if defined(DRM_I915_SET_SPRITE_COLORKEY)
if (video->color_key_changed || video->plane != s.plane_id) {
struct drm_intel_set_sprite_destkey set;
struct drm_intel_sprite_colorkey set;
DBG(("%s: updating color key: %x\n",
__FUNCTION__, video->color_key));
set.plane_id = s.plane_id;
set.value = video->color_key;
set.min_value = video->color_key;
set.max_value = video->color_key; /* not used for destkey */
set.channel_mask = 0x7 << 24 | 0xff << 16 | 0xff << 8 | 0xff << 0;
set.flags = 0;
if (!video->AlwaysOnTop)
set.flags = I915_SET_COLORKEY_DESTINATION;
if (drmIoctl(sna->kgem.fd,
DRM_IOCTL_I915_SET_SPRITE_DESTKEY,
DRM_IOCTL_I915_SET_SPRITE_COLORKEY,
&set))
xf86DrvMsg(sna->scrn->scrnIndex, X_ERROR,
"failed to update color key\n");