summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alex@t41p.hsd1.va.comcast.net>2007-06-25 16:16:18 -0400
committerAlex Deucher <alex@t41p.hsd1.va.comcast.net>2007-06-25 16:16:18 -0400
commit01bd5eb713500d3e3d4351865d460c8d1e476454 (patch)
treefa6ce28e9614ce26830c583d13ae1fe651cfaa7b
parent52cc1dc1491559a9055f3ba6dd54064bb382ad86 (diff)
RADEON: fix possible segfault on mobility chips with MM tables
reported by Stefan Buehler
-rw-r--r--src/radeon_video.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/radeon_video.c b/src/radeon_video.c
index 95db9ef4..dbf66dac 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -1188,17 +1188,10 @@ static void RADEONSetupTheatre(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
/* Go and find Rage Theatre, if it exists */
- switch(info->Chipset){
- case PCI_CHIP_RADEON_LY:
- case PCI_CHIP_RADEON_LZ:
- xf86DrvMsg(pScrn->scrnIndex,X_INFO,"Detected Radeon Mobility M6, not scanning for Rage Theatre\n");
- break;
- case PCI_CHIP_RADEON_LW:
- xf86DrvMsg(pScrn->scrnIndex,X_INFO,"Detected Radeon Mobility M7, not scanning for Rage Theatre\n");
- break;
- default:
- pPriv->theatre=xf86_DetectTheatre(pPriv->VIP);
- }
+ if (info->IsMobility)
+ xf86DrvMsg(pScrn->scrnIndex,X_INFO,"Detected Radeon Mobility, not scanning for Rage Theatre\n");
+ else
+ pPriv->theatre=xf86_DetectTheatre(pPriv->VIP);
if(pPriv->theatre==NULL)return;