From 881334543d2711f159c8fcaf4a30b8b0db3186d7 Mon Sep 17 00:00:00 2001
From: Matthias Hopf <mhopf@suse.de>
Date: Fri, 17 Apr 2009 15:24:32 +0200
Subject: [PATCH] FB mapping cleanup didn't reflect changes to allocation. Fixes #21233.
---
src/rhd_driver.c | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/src/rhd_driver.c b/src/rhd_driver.c
index f849faa..7469945 100644
--- a/src/rhd_driver.c
+++ b/src/rhd_driver.c
@@ -1899,21 +1899,13 @@ rhdUnmapFB(RHDPtr rhdPtr)
if (!rhdPtr->FbBase)
return;
- switch (rhdPtr->ChipSet) {
- case RHD_RS690:
- case RHD_RS740:
- xf86UnMapVidMem(rhdPtr->scrnIndex, (pointer)rhdPtr->FbBase,
- rhdPtr->FbMapSize);
- break;
- default:
#ifdef XSERVER_LIBPCIACCESS
- pci_device_unmap_range(rhdPtr->PciInfo, (pointer)rhdPtr->FbBase,
- rhdPtr->FbMapSize);
+ pci_device_unmap_range(rhdPtr->PciInfo, (pointer)rhdPtr->FbBase,
+ rhdPtr->FbMapSize);
#else
- xf86UnMapVidMem(rhdPtr->scrnIndex, (pointer)rhdPtr->FbBase,
- rhdPtr->FbMapSize);
+ xf86UnMapVidMem(rhdPtr->scrnIndex, (pointer)rhdPtr->FbBase,
+ rhdPtr->FbMapSize);
#endif
- }
rhdPtr->FbBase = NULL;
}
--
1.6.0.2