blob: 064c0cc1a3ac3623ab910846cb675545272364fd (
plain)
1 From 6661bdd4551e4e63e983685464a277845aed3012 Mon Sep 17 00:00:00 2001
2 From: Dave Airlie <airlied@gmail.com>
3 Date: Sun, 21 Sep 2014 09:51:37 +1000
4 Subject: neomagic: fix build against master X server.
5
6 Signed-off-by: Dave Airlie <airlied@redhat.com>
7
8 diff --git a/src/neo_driver.c b/src/neo_driver.c
9 index 1b0da34..da01962 100644
10 --- a/src/neo_driver.c
11 +++ b/src/neo_driver.c
12 @@ -1994,10 +1994,12 @@ neoMapMem(ScrnInfoPtr pScrn)
13 }
14 #endif
15 } else
16 +#ifdef VIDMEM_MMIO
17 nPtr->NeoMMIOBase =
18 xf86MapVidMem(pScrn->scrnIndex,
19 VIDMEM_MMIO, nPtr->NeoMMIOAddr,
20 0x200000L);
21 +#endif
22 if (nPtr->NeoMMIOBase == NULL)
23 return FALSE;
24 }
25 @@ -2024,10 +2026,12 @@ neoMapMem(ScrnInfoPtr pScrn)
26 }
27 #endif
28 else
29 +#ifdef VIDMEM_FRAMEBUFFER
30 nPtr->NeoFbBase =
31 xf86MapVidMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
32 (unsigned long)nPtr->NeoLinearAddr,
33 nPtr->NeoFbMapSize);
34 +#endif
35 if (nPtr->NeoFbBase == NULL)
36 return FALSE;
37 return TRUE;
38 --
39 cgit v0.10.2
|
