andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modesetting: ms_dri2_create_buffer: check screen of existing front buffers

Browse Source 
If a frontbuffer drawable already has a pixmap, make sure it was created
on the right screen.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Hans de Goede 2016-08-15 10:44:57 +02:00 committed by Adam Jackson
parent 35c4e96ed1
commit 03a7c50202
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/xfree86/drivers/modesetting/dri2.c
View File

@ -118,17 +118,6 @@ get_drawable_pixmap(DrawablePtr drawable)
return screen->GetWindowPixmap((WindowPtr) drawable);
}
static PixmapPtr
get_front_buffer(DrawablePtr drawable)
{
PixmapPtr pixmap;
pixmap = get_drawable_pixmap(drawable);
pixmap->refcnt++;
return pixmap;
}
static DRI2Buffer2Ptr
ms_dri2_create_buffer(DrawablePtr drawable, unsigned int attachment,
unsigned int format)
@ -152,8 +141,13 @@ ms_dri2_create_buffer(DrawablePtr drawable, unsigned int attachment,
}
pixmap = NULL;
if (attachment == DRI2BufferFrontLeft)
pixmap = get_front_buffer(drawable);
if (attachment == DRI2BufferFrontLeft) {
pixmap = get_drawable_pixmap(drawable);
if (pixmap && pixmap->drawable.pScreen != screen)
pixmap = NULL;
if (pixmap)
pixmap->refcnt++;
}
if (pixmap == NULL) {
int pixmap_width = drawable->width;