diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-12-05 19:38:32 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-12-05 19:38:32 +0000 |
| commit | dfa5c47f21cffb9d1b903454a1630c89d905c517 (patch) | |
| tree | b0bc873a2e4ed4353888591d613e935a012874d8 /driver/xf86-video-savage/src/savage_driver.c | |
| parent | 562adcce74ecd12a2c3598d14459294562e7ee73 (diff) | |
Update to xf86-video-savage 2.3.2. Committed from a Savage4 card.
Diffstat (limited to 'driver/xf86-video-savage/src/savage_driver.c')
| -rw-r--r-- | driver/xf86-video-savage/src/savage_driver.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/driver/xf86-video-savage/src/savage_driver.c b/driver/xf86-video-savage/src/savage_driver.c index d9f7f20b3..b71f239e7 100644 --- a/driver/xf86-video-savage/src/savage_driver.c +++ b/driver/xf86-video-savage/src/savage_driver.c @@ -1700,8 +1700,8 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) "%s DVI port support (Savage4 only)\n",(psav->dvi?"Force":"Disable")); } - psav->AGPforXv = FALSE; #ifdef XF86DRI + psav->AGPforXv = FALSE; if (xf86GetOptValBool(psav->Options, OPTION_AGP_FOR_XV, &psav->AGPforXv)) { if (psav->AGPforXv) { if (psav->agpSize == 0) { @@ -4269,6 +4269,7 @@ SavageUpdateKey(ScrnInfoPtr pScrn, int r, int g, int b) ol = 0; } if (!(pScreen = pScrn->pScreen) + || !psav->FBStart2nd || !(pScrOvlPriv = fbOverlayGetScrPriv(pScreen))) return; key = ((Shift(r,psav->overlay.redShift) & psav->overlay.redMask) |