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

Save/restore cursor registers 

There are lots of good reasons for doing this, one of them is fdo bug #11305.
This commit is contained in:
Jesse Barnes 2008-05-07 14:46:52 -07:00 committed by Jesse Barnes
parent a7188b1f2d
commit 33f033cbf3
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/i830.h
View File

@ -624,6 +624,12 @@ typedef struct _I830Rec {
uint32_t saveVCLK_DIVISOR_VGA1;
uint32_t saveVCLK_POST_DIV;
uint32_t saveVGACNTRL;
uint32_t saveCURSOR_A_CONTROL;
uint32_t saveCURSOR_A_BASE;
uint32_t saveCURSOR_A_POSITION;
uint32_t saveCURSOR_B_CONTROL;
uint32_t saveCURSOR_B_BASE;
uint32_t saveCURSOR_B_POSITION;
uint32_t saveADPA;
uint32_t saveLVDS;
uint32_t saveDVOA;

21
src/i830_driver.c
View File

@ -2037,6 +2037,13 @@ SaveHWState(ScrnInfoPtr pScrn)
pI830->saveVCLK_POST_DIV = INREG(VCLK_POST_DIV);
pI830->saveVGACNTRL = INREG(VGACNTRL);
pI830->saveCURSOR_A_CONTROL = INREG(CURSOR_A_CONTROL);
pI830->saveCURSOR_A_POSITION = INREG(CURSOR_A_POSITION);
pI830->saveCURSOR_A_BASE = INREG(CURSOR_A_BASE);
pI830->saveCURSOR_B_CONTROL = INREG(CURSOR_B_CONTROL);
pI830->saveCURSOR_B_POSITION = INREG(CURSOR_B_POSITION);
pI830->saveCURSOR_B_BASE = INREG(CURSOR_B_BASE);
for(i = 0; i < 7; i++) {
pI830->saveSWF[i] = INREG(SWF0 + (i << 2));
pI830->saveSWF[i+7] = INREG(SWF00 + (i << 2));
@ -2238,6 +2245,20 @@ RestoreHWState(ScrnInfoPtr pScrn)
OUTREG(VGACNTRL, pI830->saveVGACNTRL);
/*
* Restore cursors
* Even though the X cursor is hidden before we restore the hw state,
* we probably only disabled one cursor plane. If we're going from
* e.g. plane b to plane a here in RestoreHWState, we need to restore
* both cursor plane settings.
*/
OUTREG(CURSOR_A_POSITION, pI830->saveCURSOR_A_POSITION);
OUTREG(CURSOR_A_BASE, pI830->saveCURSOR_A_BASE);
OUTREG(CURSOR_A_CONTROL, pI830->saveCURSOR_A_CONTROL);
OUTREG(CURSOR_B_POSITION, pI830->saveCURSOR_B_POSITION);
OUTREG(CURSOR_B_BASE, pI830->saveCURSOR_B_BASE);
OUTREG(CURSOR_B_CONTROL, pI830->saveCURSOR_B_CONTROL);
/* Restore outputs */
for (i = 0; i < xf86_config->num_output; i++) {
xf86OutputPtr output = xf86_config->output[i];