summaryrefslogtreecommitdiff
path: root/src/lx_driver.c
diff options
context:
space:
mode:
authorJordan Crouse <jordan.crouse@amd.com>2008-08-25 11:34:36 -0600
committerJordan Crouse <jordan.crouse@amd.com>2008-08-25 11:34:36 -0600
commitc6339a360b611514155e5101dc2c5bc6472d8865 (patch)
tree24d980a9b138903ecd87dbb9ae2b7c23ff052855 /src/lx_driver.c
parent38e868271bd24be7a884c8c56772b25cd6fa6f1d (diff)
[LX] - RandR 1.2 updates
Remove a flag that was making EXA pixmaps break horribly. Also, Make the new code compile for Hardy and warning cleanups.
Diffstat (limited to 'src/lx_driver.c')
-rw-r--r--src/lx_driver.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lx_driver.c b/src/lx_driver.c
index 9f68a03..2ee6a1a 100644
--- a/src/lx_driver.c
+++ b/src/lx_driver.c
@@ -37,6 +37,7 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Resources.h"
+#include "xf86i2c.h"
#include "xf86Crtc.h"
#include "xf86cmap.h"
#include "compiler.h"
@@ -598,7 +599,6 @@ static Bool
LXUnmapMem(ScrnInfoPtr pScrni)
{
GeodeRec *pGeode = GEODEPTR(pScrni);
- pciVideoPtr pci = xf86GetPciInfoForEntity(pGeode->pEnt->index);
#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrni->scrnIndex, (pointer) cim_gp_ptr, LX_GP_REG_SIZE);
@@ -608,6 +608,8 @@ LXUnmapMem(ScrnInfoPtr pScrni)
xf86UnMapVidMem(pScrni->scrnIndex, (pointer) cim_vip_ptr,
LX_VIP_REG_SIZE);
#else
+ pciVideoPtr pci = xf86GetPciInfoForEntity(pGeode->pEnt->index);
+
unmap_pci_mem(pScrni, pci, cim_gp_ptr, LX_GP_REG_SIZE);
unmap_pci_mem(pScrni, pci, cim_vg_ptr, LX_VG_REG_SIZE);
unmap_pci_mem(pScrni, pci, cim_vid_ptr, LX_VID_REG_SIZE);