From 5b5b90c2cea7e36895354f5872acd3fc769653f9 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 25 Jun 2007 16:27:54 -0400 Subject: RADEON: fix possible segfault on mobility chips with MM tables spotted by Stefan Buehler --- src/radeon_video.c | 16 +++++----------- 1 file 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; -- cgit v1.2.3