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

sna: Fix assertions for transformed cursors 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2015-03-13 15:21:26 +00:00
parent c2381ac065
commit 359f12312e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sna/sna_display.c
View File

@ -4854,8 +4854,8 @@ static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc)
cursor ? cursor->serial : 0,
sna->cursor.serial));
if (cursor && cursor->serial == sna->cursor.serial) {
assert(cursor->size == sna->cursor.size);
assert(cursor->rotation == crtc->transform_in_use ? crtc->rotation : RR_Rotate_0);
assert(cursor->size == sna->cursor.size || cursor->transformed);
assert(cursor->rotation == (!to_sna_crtc(crtc)->cursor_transform && crtc->transform_in_use) ? crtc->rotation : RR_Rotate_0);
assert(cursor->ref);
return cursor;
}
@ -4868,7 +4868,7 @@ static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc)
get_cursor_argb(sna->cursor.ref) != NULL));
transformed = to_sna_crtc(crtc)->cursor_transform;
rotation = !transformed && crtc->transform_in_use ? crtc->rotation : RR_Rotate_0;
rotation = (!transformed && crtc->transform_in_use) ? crtc->rotation : RR_Rotate_0;
/* Don't allow phys cursor sharing */
if (sna->cursor.use_gtt && !transformed) {