XLibre/xf86-video-intel
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-intel.git synced 2026-03-24 01:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

sna/video/sprite: Extract sna_video_sprite_hide()

Browse Source 
Extract the code that turns off the sprite into a small helper.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
This commit is contained in:
Ville Syrjälä
2019-11-11 19:02:15 +02:00
parent ee0cc334df
commit b45e222e71
1 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/sna/sna_video_sprite.c
View File

@@ -93,10 +93,20 @@ static const XvAttributeRec attribs[] = {
{ XvSettable | XvGettable, 0, 1, (char *)"XV_ALWAYS_ON_TOP" },
};
static void sna_video_sprite_hide(xf86CrtcPtr crtc, struct sna_video *video)
{
struct local_mode_set_plane s = {
.plane_id = sna_crtc_to_sprite(crtc, video->idx),
};
if (drmIoctl(video->sna->kgem.fd, LOCAL_IOCTL_MODE_SETPLANE, &s))
xf86DrvMsg(video->sna->scrn->scrnIndex, X_ERROR,
"failed to disable plane\n");
}
static int sna_video_sprite_stop(ddStopVideo_ARGS)
{
struct sna_video *video = port->devPriv.ptr;
struct local_mode_set_plane s;
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(video->sna->scrn);
int i;
@@ -109,12 +119,7 @@ static int sna_video_sprite_stop(ddStopVideo_ARGS)
if (video->bo[index] == NULL)
continue;
memset(&s, 0, sizeof(s));
s.plane_id = sna_crtc_to_sprite(crtc, video->idx);
if (drmIoctl(video->sna->kgem.fd, LOCAL_IOCTL_MODE_SETPLANE, &s))
xf86DrvMsg(video->sna->scrn->scrnIndex, X_ERROR,
"failed to disable plane\n");
sna_video_sprite_hide(crtc, video);
kgem_bo_replace(&video->sna->kgem, &video->bo[index], NULL);
}
@@ -322,13 +327,8 @@ sna_video_sprite_show(struct sna *sna,
if (drmIoctl(sna->kgem.fd,
LOCAL_IOCTL_I915_SET_SPRITE_COLORKEY,
&set)) {
memset(&s, 0, sizeof(s));
s.plane_id = sna_crtc_to_sprite(crtc, video->idx);
/* try to disable the plane first */
if (drmIoctl(video->sna->kgem.fd, LOCAL_IOCTL_MODE_SETPLANE, &s))
xf86DrvMsg(video->sna->scrn->scrnIndex, X_ERROR,
"failed to disable plane\n");
sna_video_sprite_hide(crtc, video);
if (drmIoctl(sna->kgem.fd, LOCAL_IOCTL_I915_SET_SPRITE_COLORKEY, &set)) {
xf86DrvMsg(sna->scrn->scrnIndex, X_ERROR,
@@ -542,12 +542,7 @@ retry:
off:
assert(index < ARRAY_SIZE(video->bo));
if (video->bo[index]) {
struct local_mode_set_plane s;
memset(&s, 0, sizeof(s));
s.plane_id = sna_crtc_to_sprite(crtc, video->idx);
if (drmIoctl(video->sna->kgem.fd, LOCAL_IOCTL_MODE_SETPLANE, &s))
xf86DrvMsg(video->sna->scrn->scrnIndex, X_ERROR,
"failed to disable plane\n");
sna_video_sprite_hide(crtc, video);
kgem_bo_replace(&sna->kgem, &video->bo[index], NULL);
}
continue;