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

Checking if server isn't switched away before calling sync. 

Sanity check for possible bugs in aother areas of the code.
Fixing default amount of of allocated video memory from AGP for i810: Use 16MB
if less than 192MB are installed else use 24MB (Matthias Hopf).
This commit is contained in:
Egbert Eich 2004-10-11 09:58:04 +00:00
parent d2866271b8
commit 687298daed
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/i810_accel.c
View File

@ -259,7 +259,7 @@ I810Sync(ScrnInfoPtr pScrn)
#ifdef XF86DRI
/* VT switching tries to do this.
*/
if (!pI810->LockHeld && pI810->directRenderingEnabled) {
if ((!pI810->LockHeld && pI810->directRenderingEnabled) || pScrn->vtSema) {
return;
}
#endif

7
src/i810_driver.c
View File

@ -905,10 +905,13 @@ I810PreInit(ScrnInfoPtr pScrn, int flags)
* Changed to 8 Meg so we can have acceleration by default (Mark).
*/
mem = I810CheckAvailableMemory(pScrn);
if (pI810->directRenderingDisabled || mem < 134217728) /* < 128 MB */
if (pI810->directRenderingDisabled || mem < 131072) /* < 128 MB */
pScrn->videoRam = 8192;
else if (mem < 196608)
pScrn->videoRam = 16384; /* < 192 MB */
else
pScrn->videoRam = 16384;
pScrn->videoRam = 24576;
from = X_DEFAULT;
if (pI810->pEnt->device->videoRam) {