diff options
| author | Luc Verhaegen <libv@skynet.be> | 2006-02-10 15:11:30 +0000 |
|---|---|---|
| committer | Luc Verhaegen <libv@skynet.be> | 2006-02-10 15:11:30 +0000 |
| commit | e5be7c9cab52ce9358d3956943b47f38fa6be4a1 (patch) | |
| tree | b9210115cb3e4ef5580b02d606395ca91ce7f195 | |
| parent | 8c7ab5483ba1f601152f28cc1a0317288b3b2e95 (diff) | |
[devel-dma_blit_flags] Fix build against newish via_drm.h: unused
blit.bouncebuffer changed to blit.flags. (reported by Thomas
Hellstrom).
| -rw-r--r-- | src/via_video.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/via_video.c b/src/via_video.c index ca4923d..e4c1519 100644 --- a/src/via_video.c +++ b/src/via_video.c @@ -1660,14 +1660,14 @@ RegionsEqual(ScreenPtr pScreen, RegionPtr A, RegionPtr B) #endif /* !REGION_EQUAL */ /* - * There is no via_drm.h versioning so we need to revert to using defines - * directly.. + * There was no via_drm.h versioning so we were forced to revert to using + * defines directly... */ #ifdef DRM_VIA_DMA_BLIT /* * Clean Xv code has the client align data for the driver and thus the hardware. * This means that a block needs to be dmaed over, pitch alignment has already - * been taken care of. The DRM side will be adapted to do this more efficiently. + * been taken care of. */ static Bool ViaSwovCopyDMA(VIAPtr pVia, struct ViaMem *Mem, unsigned char *buf) @@ -1710,7 +1710,12 @@ ViaSwovCopyDMA(VIAPtr pVia, struct ViaMem *Mem, unsigned char *buf) blit.fb_stride = width; blit.mem_addr = aligned_buf; blit.mem_stride = width; - blit.bounce_buffer = 0; /* not implemented anyway */ + /* not used anyway. */ +#ifdef VIA_DRMH_MAJOR + blit.flags = 0; +#else + blit.bouncebuffer = 0; +#endif blit.to_fb = 1; /* shedule this copy */ |