summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alex@t41p.hsd1.va.comcast.net>2007-06-25 16:27:54 -0400
committerAlex Deucher <alex@t41p.hsd1.va.comcast.net>2007-06-25 16:27:54 -0400
commit5b5b90c2cea7e36895354f5872acd3fc769653f9 (patch)
tree3826c960564743a78c632562e3ce3d4176d293f1
parent92e65d5e0d6817ff4c9a08020a0a9b3a8c3c98b0 (diff)
RADEON: fix possible segfault on mobility chips with MM tables
spotted by Stefan Buehler
-rw-r--r--src/radeon_video.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/radeon_video.c b/src/radeon_video.c
index 390df892..2f8bec52 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -1189,17 +1189,11 @@ 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;