diff options
| author | matthew green <mrg@eterna.com.au> | 2011-03-21 12:17:58 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2011-03-21 12:17:58 -0400 |
| commit | fe2e0ad3ffa58f40311319c950b842e2928a5740 (patch) | |
| tree | 156d3354e0b156864a4a8431182992245a9f8b98 | |
| parent | 83978ad5fe37581e2b2f3fbd9c073d91b2ae1d50 (diff) | |
bug fix for r6xx/r7xx UMS
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
| -rw-r--r-- | src/r600_exa.c | 4 | ||||
| -rw-r--r-- | src/radeon_textured_video.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/r600_exa.c b/src/r600_exa.c index 0ed0ced..7736d24 100644 --- a/src/r600_exa.c +++ b/src/r600_exa.c @@ -621,8 +621,12 @@ R600PrepareCopy(PixmapPtr pSrc, PixmapPtr pDst, return FALSE; if (accel_state->same_surface == TRUE) { +#if defined(XF86DRM_MODE) unsigned height = RADEON_ALIGN(pDst->drawable.height, drmmode_get_height_align(pScrn, accel_state->dst_obj.tiling_flags)); +#else + unsigned height = pDst->drawable.height; +#endif unsigned long size = height * accel_state->dst_obj.pitch * pDst->drawable.bitsPerPixel/8; #if defined(XF86DRM_MODE) diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c index c886ed0..d247db6 100644 --- a/src/radeon_textured_video.c +++ b/src/radeon_textured_video.c @@ -248,7 +248,11 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, BoxRec dstBox; int dst_width = width, dst_height = height; int aligned_height; +#ifdef XF86DRM_MODE int h_align = drmmode_get_height_align(pScrn, 0); +#else + int h_align = 1; +#endif /* make the compiler happy */ s2offset = s3offset = srcPitch2 = 0; |