projects
/
platform
/
upstream
/
xf86-video-intel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
00dcb4f
)
sna: Handle failure to disable old plane when switching CRTCs
author
Zdenek Kabelac
<zkabelac@redhat.com>
Mon, 25 Nov 2013 09:57:19 +0000
(09:57 +0000)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Mon, 25 Nov 2013 10:04:49 +0000
(10:04 +0000)
If we fail to disable the old plane, abort the PutImage and report the
error.
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
src/sna/sna_video_sprite.c
patch
|
blob
|
history
diff --git
a/src/sna/sna_video_sprite.c
b/src/sna/sna_video_sprite.c
index
b6e7b94
..
b6a7950
100644
(file)
--- a/
src/sna/sna_video_sprite.c
+++ b/
src/sna/sna_video_sprite.c
@@
-315,7
+315,10
@@
sna_video_sprite_show(struct sna *sna,
if (video->plane) {
memset(&s, 0, sizeof(s));
s.plane_id = video->plane;
- drmIoctl(video->sna->kgem.fd, DRM_IOCTL_MODE_SETPLANE, &s);
+ if (drmIoctl(video->sna->kgem.fd, DRM_IOCTL_MODE_SETPLANE, &s)) {
+ DBG(("SET_PLANE failed to turn off existing sprite: ret=%d\n", errno));
+ return false;
+ }
}
video->plane = s.plane_id;
}