diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2007-03-09 15:14:48 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2007-03-09 15:14:48 +0100 |
| commit | aef161853033907c6916337cebe88c8f111dd542 (patch) | |
| tree | d8b5b87074eb841427de650ca0278212ed025052 /src | |
| parent | 1b54ee493fb96f944aa81e56fa6f00a8067f87fc (diff) | |
| parent | 14ee9195d203192d3f613919f230b20b900ffdba (diff) | |
Merge remote branch 'origin/master' into i830-pageflip
Diffstat (limited to 'src')
| -rw-r--r-- | src/i810_accel.c | 3 | ||||
| -rw-r--r-- | src/i810_dri.c | 8 | ||||
| -rw-r--r-- | src/i830_driver.c | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/i810_accel.c b/src/i810_accel.c index efbe2907..1f859b8a 100644 --- a/src/i810_accel.c +++ b/src/i810_accel.c @@ -597,7 +597,8 @@ I810RefreshRing(ScrnInfoPtr pScrn) if (pI810->LpRing->space < 0) pI810->LpRing->space += pI810->LpRing->mem.Size; - pI810->AccelInfoRec->NeedToSync = TRUE; + if (pI810->AccelInfoRec) + pI810->AccelInfoRec->NeedToSync = TRUE; } /* Emit on gaining VT? diff --git a/src/i810_dri.c b/src/i810_dri.c index 3e322837..72718d34 100644 --- a/src/i810_dri.c +++ b/src/i810_dri.c @@ -222,6 +222,7 @@ I810InitVisualConfigs(ScreenPtr pScreen) pConfigs[i].redSize = 5; pConfigs[i].greenSize = 6; pConfigs[i].blueSize = 5; + pConfigs[i].alphaSize = 0; pConfigs[i].redMask = 0x0000F800; pConfigs[i].greenMask = 0x000007E0; pConfigs[i].blueMask = 0x0000001F; @@ -1173,7 +1174,9 @@ I810DRIInitBuffers(WindowPtr pWin, RegionPtr prgn, CARD32 index) pbox++; } I810SelectBuffer(pScrn, I810_SELECT_FRONT); - pI810->AccelInfoRec->NeedToSync = TRUE; + + if (pI810->AccelInfoRec) + pI810->AccelInfoRec->NeedToSync = TRUE; } /* This routine is a modified form of XAADoBitBlt with the calls to @@ -1332,7 +1335,8 @@ I810DRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg, DEALLOCATE_LOCAL(pboxNew1); } - pI810->AccelInfoRec->NeedToSync = TRUE; + if (pI810->AccelInfoRec) + pI810->AccelInfoRec->NeedToSync = TRUE; } diff --git a/src/i830_driver.c b/src/i830_driver.c index a889612d..599edc38 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -2985,6 +2985,8 @@ I830CloseScreen(int scrnIndex, ScreenPtr pScreen) pI830->CursorInfoRec = 0; } + i830_reset_allocations(pScrn); + if (I830IsPrimary(pScrn)) { xf86GARTCloseScreen(scrnIndex); |