diff options
| author | Owain Ainsworth <oga@cvs.openbsd.org> | 2009-01-10 15:06:19 +0000 |
|---|---|---|
| committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2009-01-10 15:06:19 +0000 |
| commit | 4d4ba33a76f102f8998c526be04769961450399a (patch) | |
| tree | d71d2c51db86e41e7bda580ba37c7b7f8baf32f6 | |
| parent | 9734f0a169a7f5f71754438afa4dc066e51b94df (diff) | |
Don't map the mmio region via the drm. This was only passed onto the
mesa dri driver, which hasn't needed this for a while.
ok matthieu@.
| -rw-r--r-- | driver/xf86-video-intel/src/i830_dri.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/driver/xf86-video-intel/src/i830_dri.c b/driver/xf86-video-intel/src/i830_dri.c index 6bc495787..bbdde415b 100644 --- a/driver/xf86-video-intel/src/i830_dri.c +++ b/driver/xf86-video-intel/src/i830_dri.c @@ -176,7 +176,7 @@ I830InitDma(ScrnInfoPtr pScrn) info.ring_end = ring->mem->end + pI830->LinearAddr; info.ring_size = ring->mem->size; - info.mmio_offset = (unsigned int)pI830DRI->regs; + info.mmio_offset = -1; info.sarea_priv_offset = sizeof(XF86DRISAREARec); @@ -785,16 +785,6 @@ I830DRIDoMappings(ScreenPtr pScreen) drmI830Sarea *sarea = (drmI830Sarea *) DRIGetSAREAPrivate(pScreen); DPRINTF(PFX, "I830DRIDoMappings\n"); - pI830DRI->regsSize = I830_REG_SIZE; - if (drmAddMap(pI830->drmSubFD, (drm_handle_t)pI830->MMIOAddr, - pI830DRI->regsSize, DRM_REGISTERS, 0, - (drmAddress) &pI830DRI->regs) < 0) { - xf86DrvMsg(pScreen->myNum, X_ERROR, "[drm] drmAddMap(regs) failed\n"); - DRICloseScreen(pScreen); - return FALSE; - } - xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Registers = 0x%08x\n", - (int)pI830DRI->regs); if (drmAddMap(pI830->drmSubFD, (drm_handle_t)pI830->LpRing->mem->offset + pI830->LinearAddr, |