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

sna: Only reshow unhidden cursors after modesetting 

Reported-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2014-11-10 13:30:15 +00:00
parent 0267f5902d
commit b2492fa45b
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/sna/sna.h
View File

@ -326,6 +326,7 @@ struct sna {
uint32_t fg, bg;
int size;
int active;
int last_x;
int last_y;

14
src/sna/sna_display.c
View File

@ -4728,6 +4728,7 @@ sna_show_cursors(ScrnInfoPtr scrn)
}
}
sigio_unblock(sigio);
sna->cursor.active = true;
}
static void
@ -4792,6 +4793,7 @@ sna_hide_cursors(ScrnInfoPtr scrn)
int sigio, c;
DBG(("%s\n", __FUNCTION__));
sna->cursor.active = false;
sigio = sigio_block();
for (c = 0; c < sna->mode.num_real_crtc; c++) {
@ -5136,9 +5138,11 @@ sna_cursors_init(ScreenPtr screen, struct sna *sna)
static void
sna_cursors_reload(struct sna *sna)
{
sna_set_cursor_position(sna->scrn,
sna->cursor.last_x,
sna->cursor.last_y);
DBG(("%s: active?=%d\n", __FUNCTION__, sna->cursor.active));
if (sna->cursor.active)
sna_set_cursor_position(sna->scrn,
sna->cursor.last_x,
sna->cursor.last_y);
}
static void
@ -5933,6 +5937,9 @@ sna_mode_disable(struct sna *sna)
if (!sna->scrn->vtSema)
return false;
/* XXX we will cause previously hidden cursors to be reshown, but
* this should be a rare fixup case for severe fragmentation.
*/
sna_hide_cursors(sna->scrn);
for (i = 0; i < sna->mode.num_real_crtc; i++)
sna_crtc_disable(config->crtc[i]);
@ -5967,6 +5974,7 @@ sna_mode_enable(struct sna *sna)
}
update_flush_interval(sna);
sna_show_cursors(sna->scrn);
}
void