diff options
| author | Eric Anholt <eric@anholt.net> | 2006-11-16 19:47:24 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-11-16 19:47:24 -0800 |
| commit | 9948d8377d70e898260c12210151b952b3fb8bf1 (patch) | |
| tree | 4b06daa112c4bc053586cfa832837e069d017fa8 /src/i810_driver.c | |
| parent | 45a27f80e1c783627f570c309e7a853dcc9af0c1 (diff) | |
| parent | b649f95ea6fd3555d073fdbf8f2f035dfe1afd33 (diff) | |
Merge branch 'master' into modesetting
Conflicts:
src/i830.h
src/i830_cursor.c
src/i830_dri.c
src/i830_driver.c
src/i830_video.c
Diffstat (limited to 'src/i810_driver.c')
| -rw-r--r-- | src/i810_driver.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/i810_driver.c b/src/i810_driver.c index 60030ffd..6ba0030c 100644 --- a/src/i810_driver.c +++ b/src/i810_driver.c @@ -313,6 +313,12 @@ const char *I810drmSymbols[] = { "drmGetLibVersion", "drmGetVersion", "drmRmMap", +#ifdef XSERVER_LIBDRM_MM + "drmMMInit", + "drmMMTakedown", + "drmMMLock", + "drmMMUnlock", +#endif NULL }; @@ -1194,14 +1200,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; |