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

Move the remaining two lines of SetHWOperatingState to the caller.

This commit is contained in:
Eric Anholt 2008-06-05 13:40:55 -07:00
parent adb4f5a5e8
commit b65f67b74f
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/i830_driver.c
View File

@ -1965,22 +1965,6 @@ i830_set_dsparb(ScrnInfoPtr pScrn)
}
}
/*
* This should be called everytime the X server gains control of the screen,
* before any video modes are programmed (ScreenInit, EnterVT).
*/
static void
SetHWOperatingState(ScrnInfoPtr pScrn)
{
I830Ptr pI830 = I830PTR(pScrn);
DPRINTF(PFX, "SetHWOperatingState\n");
i830_start_ring(pScrn);
if (!pI830->SWCursor)
I830InitHWCursor(pScrn);
}
enum pipe {
PIPE_A = 0,
PIPE_B,
@ -3380,7 +3364,9 @@ I830EnterVT(int scrnIndex, int flags)
}
i830_stop_ring(pScrn, FALSE);
SetHWOperatingState(pScrn);
i830_start_ring(pScrn);
if (!pI830->SWCursor)
I830InitHWCursor(pScrn);
/* Set the DSPARB register. This disables the outputs, which is about to
* happen (likely) in xf86SetDesiredModes anyway.