summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <agd5f@yahoo.com>2004-07-26 23:14:37 +0000
committerAlex Deucher <agd5f@yahoo.com>2004-07-26 23:14:37 +0000
commit8b030a847771f6b34bf38913eb6b53543f320f29 (patch)
treed4ad24783c0023f5071e5dc4863505f3a6903e84
parente9a123f08880882a519b6eba8305d62ac375ca10 (diff)
- Add Radeon DynamicClocks option
- Add small fixes and clean ups from ati's last code drop (typo_fixes, remove_fudge, laptop, xvfix) - fix possible segfault in mga_dri.c (Ryan Underwood) - Add Xv support to pre-nm2160 neomagic chipsets
-rw-r--r--src/mga_dri.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mga_dri.c b/src/mga_dri.c
index a943b6b..098b24b 100644
--- a/src/mga_dri.c
+++ b/src/mga_dri.c
@@ -515,8 +515,10 @@ static void MGAWakeupHandler( int screenNum, pointer wakeupData,
{
ScreenPtr pScreen = screenInfo.screens[screenNum];
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ MGAPtr pMga = MGAPTR(pScrn);
- if ( xf86IsEntityShared( pScrn->entityList[0] ) ) {
+ if ( xf86IsEntityShared( pScrn->entityList[0] )
+ && pMga->DualHeadEnabled) {
MGASwapContextShared( pScreen );
} else {
MGASwapContext( pScreen );
@@ -1115,7 +1117,8 @@ Bool MGADRIScreenInit( ScreenPtr pScreen )
pDRIInfo->CreateContext = MGACreateContext;
pDRIInfo->DestroyContext = MGADestroyContext;
- if ( xf86IsEntityShared( pScrn->entityList[0] ) ) {
+ if ( xf86IsEntityShared( pScrn->entityList[0] )
+ && pMga->DualHeadEnabled) {
pDRIInfo->SwapContext = MGADRISwapContextShared;
} else {
pDRIInfo->SwapContext = MGADRISwapContext;