diff options
| author | Thomas Hellstrom <unichrome@shipmail.org> | 2005-10-22 16:45:05 +0000 |
|---|---|---|
| committer | Thomas Hellstrom <unichrome@shipmail.org> | 2005-10-22 16:45:05 +0000 |
| commit | 3f6d177546ea86395922374f6863953ef6c28331 (patch) | |
| tree | 14c49d7053b1203d9877efa45b0d34c775fd9d5f /src | |
| parent | 9f873c4cdce8c036c24503d6310c54425ce33435 (diff) | |
Sync via_drm.h with drm and 3D driver.
Diffstat (limited to 'src')
| -rw-r--r-- | src/via_memory.c | 2 | ||||
| -rw-r--r-- | src/xvmc/unichrome/viaLowLevel.c | 2 | ||||
| -rw-r--r-- | src/xvmc/unichromeProA/viaLowLevelPro.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/via_memory.c b/src/via_memory.c index 19efcdb..95c9dfb 100644 --- a/src/via_memory.c +++ b/src/via_memory.c @@ -110,7 +110,7 @@ unsigned long VIAAllocLinear(VIAMemPtr mem, ScrnInfoPtr pScrn, unsigned long siz mem->drm_fd = pVia->drmFD; mem->drm.context = 1; mem->drm.size = size; - mem->drm.type = VIDEO; + mem->drm.type = VIA_MEM_VIDEO; ret = drmCommandWriteRead(mem->drm_fd, DRM_VIA_ALLOCMEM, &mem->drm, sizeof(drm_via_mem_t)); if (ret || (size != mem->drm.size)) { diff --git a/src/xvmc/unichrome/viaLowLevel.c b/src/xvmc/unichrome/viaLowLevel.c index 49155d1..1add1ca 100644 --- a/src/xvmc/unichrome/viaLowLevel.c +++ b/src/xvmc/unichrome/viaLowLevel.c @@ -285,7 +285,7 @@ viaDMAInitTimeStamp(XvMCLowLevel *xl) if (xl->use_agp) { xl->tsMem.context = *(xl->drmcontext); xl->tsMem.size = 64; - xl->tsMem.type = VIDEO; + xl->tsMem.type = VIA_MEM_VIDEO; if (drmCommandWriteRead(xl->fd, DRM_VIA_ALLOCMEM, &xl->tsMem, sizeof(xl->tsMem)) < 0) return ret; if (xl->tsMem.size != 64) diff --git a/src/xvmc/unichromeProA/viaLowLevelPro.c b/src/xvmc/unichromeProA/viaLowLevelPro.c index 9871e52..666166c 100644 --- a/src/xvmc/unichromeProA/viaLowLevelPro.c +++ b/src/xvmc/unichromeProA/viaLowLevelPro.c @@ -535,7 +535,7 @@ viaDMAInitTimeStamp(XvMCLowLevel *xl) if (xl->use_agp) { xl->tsMem.context = *(xl->drmcontext); xl->tsMem.size = 64; - xl->tsMem.type = VIDEO; + xl->tsMem.type = VIA_MEM_VIDEO; if ((ret = drmCommandWriteRead(xl->fd, DRM_VIA_ALLOCMEM, &xl->tsMem, sizeof(xl->tsMem))) < 0) return ret; @@ -1339,7 +1339,7 @@ updateLowLevelBuf(XvMCLowLevel *xl, LowLevelBuffer *buf, drmCommandWrite(xl->fd, DRM_VIA_FREEMEM, mem, sizeof(*mem)); mem->context = *(xl->drmcontext); mem->size = size; - mem->type = VIDEO; + mem->type = VIA_MEM_VIDEO; if (((ret = drmCommandWriteRead(xl->fd, DRM_VIA_ALLOCMEM, mem, sizeof(mem))) < 0) || mem->size != size) { |