diff options
| author | Wang Zhenyu <zhenyu.z.wang@intel.com> | 2006-11-06 10:25:23 +0800 |
|---|---|---|
| committer | Wang Zhenyu <zhenyu.z.wang@intel.com> | 2006-11-06 10:25:23 +0800 |
| commit | 49a6bea7d969dbfd1dd542c0c3e02abc330d6850 (patch) | |
| tree | 5b79912fe66f12074a5bec42afc7e4378d5affc4 /src/i810_driver.c | |
| parent | 64447c7a059775e7ea8649f4714df7565e932c60 (diff) | |
| parent | fbb376bd1a4daad4c86e349df98438989ce173f1 (diff) | |
Merge branch 'master' into crestline
Diffstat (limited to 'src/i810_driver.c')
| -rw-r--r-- | src/i810_driver.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/i810_driver.c b/src/i810_driver.c index 48e1463b..a31e4cf8 100644 --- a/src/i810_driver.c +++ b/src/i810_driver.c @@ -315,6 +315,12 @@ const char *I810drmSymbols[] = { "drmGetLibVersion", "drmGetVersion", "drmRmMap", +#ifdef XSERVER_LIBDRM_MM + "drmMMInit", + "drmMMTakedown", + "drmMMLock", + "drmMMUnlock", +#endif NULL }; @@ -335,6 +341,8 @@ const char *I810driSymbols[] = { NULL }; +#endif /* I830_ONLY */ + const char *I810shadowSymbols[] = { "shadowInit", "shadowSetup", @@ -342,8 +350,6 @@ const char *I810shadowSymbols[] = { NULL }; -#endif /* I830_ONLY */ - #ifndef I810_DEBUG int I810_DEBUG = (0 /* | DEBUG_ALWAYS_SYNC */ @@ -410,9 +416,9 @@ i810Setup(pointer module, pointer opts, int *errmaj, int *errmin) #ifdef XF86DRI I810drmSymbols, I810driSymbols, +#endif I810shadowSymbols, I810shadowFBSymbols, -#endif I810vbeSymbols, vbeOptionalSymbols, I810ddcSymbols, I810int10Symbols, NULL); @@ -1189,14 +1195,13 @@ I810MapMem(ScrnInfoPtr pScrn) long i; for (i = 2; i < pI810->FbMapSize; i <<= 1) ; - pI810->FbMapSize = i; if (!I810MapMMIO(pScrn)) return FALSE; pI810->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER, pI810->PciTag, - pI810->LinearAddr, pI810->FbMapSize); + pI810->LinearAddr, i); if (!pI810->FbBase) return FALSE; |