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

intel-virtual-output: Check for errors whilst creating ShmPixmaps 

Creating a ShmPixmap may cause an asynchronous BadAccess error, so wrap
the construction with XSync and check for an error before proceeding.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
References: https://bugs.freedesktop.org/show_bug.cgi?id=78293
This commit is contained in:
Chris Wilson 2014-05-05 13:03:14 +01:00
parent 45892b3a63
commit a93d2d4f91
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/virtual.c
View File

@ -827,6 +827,9 @@ static void output_init_xfer(struct clone *clone, struct output *output)
{
if (output->use_shm_pixmap) {
DBG(("%s-%s: creating shm pixmap\n", DisplayString(output->dpy), output->name));
XSync(output->dpy, False);
_x_error_occurred = 0;
if (output->pixmap)
XFreePixmap(output->dpy, output->pixmap);
output->pixmap = XShmCreatePixmap(output->dpy, output->window,
@ -836,6 +839,13 @@ static void output_init_xfer(struct clone *clone, struct output *output)
XRenderFreePicture(output->dpy, output->pix_picture);
output->pix_picture = None;
}
XSync(output->dpy, False);
if (_x_error_occurred) {
XFreePixmap(output->dpy, output->pixmap);
output->pixmap = None;
output->use_shm_pixmap = 0;
}
}
if (output->use_render) {
DBG(("%s-%s: creating picture\n", DisplayString(output->dpy), output->name));