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

sna: Reshow cursors after VT switch 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2015-02-10 15:00:55 +00:00
parent 61e957cb5f
commit 8ef3fdacac
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/sna/sna_display.c
View File

@ -4876,6 +4876,23 @@ sna_crtc_disable_cursor(struct sna *sna, struct sna_crtc *crtc)
crtc->last_cursor_size = 0;
}
static void
sna_disable_cursors(ScrnInfoPtr scrn)
{
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
struct sna *sna = to_sna(scrn);
int sigio, c;
DBG(("%s\n", __FUNCTION__));
sigio = sigio_block();
for (c = 0; c < sna->mode.num_real_crtc; c++) {
assert(to_sna_crtc(xf86_config->crtc[c]));
sna_crtc_disable_cursor(sna, to_sna_crtc(xf86_config->crtc[c]));
}
sigio_unblock(sigio);
}
static void
sna_hide_cursors(ScrnInfoPtr scrn)
{
@ -6051,10 +6068,7 @@ 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);
sna_disable_cursors(sna->scrn);
for (i = 0; i < sna->mode.num_real_crtc; i++)
sna_crtc_disable(config->crtc[i], false);
assert(sna->mode.front_active == 0);
@ -6098,7 +6112,7 @@ sna_mode_enable(struct sna *sna)
}
update_flush_interval(sna);
sna_show_cursors(sna->scrn);
sna_cursors_reload(sna);
sna->mode.dirty = false;
}
@ -6667,7 +6681,7 @@ void sna_mode_reset(struct sna *sna)
DBG(("%s\n", __FUNCTION__));
sna_hide_cursors(sna->scrn);
sna_disable_cursors(sna->scrn);
for (i = 0; i < sna->mode.num_real_crtc; i++)
if (!sna_crtc_hide_planes(sna, to_sna_crtc(config->crtc[i])))
sna_crtc_disable(config->crtc[i], true);