diff options
| author | Egbert Eich <eich@suse.de> | 2004-10-11 09:58:04 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-10-11 09:58:04 +0000 |
| commit | 687298daed40aaade44e61342a9abe984088541b (patch) | |
| tree | 983da292bf6379cd8daea15b7b822e78b4bea31b /src | |
| parent | d2866271b8d42a0d44b65e30667adab96ac8fd54 (diff) | |
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).
Diffstat (limited to 'src')
| -rw-r--r-- | src/i810_accel.c | 2 | ||||
| -rw-r--r-- | src/i810_driver.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/i810_accel.c b/src/i810_accel.c index 2b0b594a..9a90e50d 100644 --- a/src/i810_accel.c +++ b/src/i810_accel.c @@ -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 diff --git a/src/i810_driver.c b/src/i810_driver.c index ca69f3b6..153ed552 100644 --- a/src/i810_driver.c +++ b/src/i810_driver.c @@ -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) { |