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

sna: Reorder disabling scanout pixmap when updating slave 

The assertion caught that we would unregister an invalid drawable on
older Xorg.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2014-07-23 11:01:07 +01:00
parent d6830190bc
commit 95c059b330
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sna/sna_display.c
View File

@ -2178,13 +2178,17 @@ sna_crtc_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr pixmap)
if (sna_crtc == NULL)
return FALSE;
if (pixmap == sna_crtc->slave_pixmap)
return TRUE;
DBG(("%s: CRTC:%d, pipe=%d setting scanout pixmap=%ld\n",
__FUNCTION__, sna_crtc->id, sna_crtc->pipe,
pixmap ? pixmap->drawable.serialNumber : 0));
/* Disable first so that we can unregister the damage tracking */
sna_crtc_disable_shadow(to_sna(crtc->scrn), sna_crtc);
sna_crtc->slave_pixmap = pixmap;
if (pixmap == NULL)
sna_crtc_disable(crtc);
return TRUE;
}