diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:26:18 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:26:18 +0000 |
| commit | bec47f9369b6f02ce4537ab1ac547ba933609edc (patch) | |
| tree | 4fc679522a0ba2737836772b91bc77aeca933bdf /src/i810_hwmc.c | |
| parent | c5b1972b50a6dbe57c67d3cc88ae010386b908a6 (diff) | |
DRI trunk-20040613 importDRI-trunk-20040721DRI-trunk-20040613
Diffstat (limited to 'src/i810_hwmc.c')
| -rw-r--r-- | src/i810_hwmc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/i810_hwmc.c b/src/i810_hwmc.c index 525ad361..8c9c3050 100644 --- a/src/i810_hwmc.c +++ b/src/i810_hwmc.c @@ -71,7 +71,7 @@ void I810XvMCDestroySubpicture (ScrnInfoPtr pScrn, XvMCSubpicturePtr pSurf); typedef struct { - drmContext drmcontext; + drm_context_t drmcontext; unsigned int fbBase; unsigned int OverlayOffset; unsigned int OverlaySize; @@ -206,12 +206,12 @@ void I810InitMC(ScreenPtr pScreen) } /* Cursor is at a page boundary, Overlay regs are not, don't forget */ - if (drmAddMap(pI810->drmSubFD, (drmHandle)pI810->CursorStart, + if (drmAddMap(pI810->drmSubFD, (drm_handle_t)pI810->CursorStart, 4096, DRM_AGP, 0, &pI810->overlay_map) < 0) { xf86DrvMsg(pScreen->myNum, X_ERROR, "drmAddMap(overlay) failed\n"); return; } - if (drmAddMap(pI810->drmSubFD, (drmHandle)pI810->MC.Start, + if (drmAddMap(pI810->drmSubFD, (drm_handle_t)pI810->MC.Start, pI810->MC.Size, DRM_AGP, 0, &pI810->mc_map) < 0) { xf86DrvMsg(pScreen->myNum, X_ERROR, "drmAddMap(MC) failed\n"); return; |