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

Fix bug #8553 & #8542 - suspend/resume regression from 1.5 driver

This commit is contained in:
Alan Hourihane 2006-10-13 12:53:53 +01:00
parent 6596333b07
commit 8045a7a0af
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/i830_driver.c
View File

@ -8041,7 +8041,11 @@ I830BIOSEnterVT(int scrnIndex, int flags)
* the Video BIOS with our saved devices, and only when that fails,
* we'll warm boot it.
*/
if (!I830Set640x480(pScrn)) {
/* Check Pipe conf registers or possibly HTOTAL/VTOTAL for 0x00000000)*/
CARD32 temp;
Bool set = I830Set640x480(pScrn);
temp = pI830->pipe ? INREG(PIPEBCONF) : INREG(PIPEACONF);
if (!set || !(temp & 0x80000000)) {
xf86Int10InfoPtr pInt;
xf86DrvMsg(pScrn->scrnIndex, X_INFO,