1119N/AFrom fe2e0ad3ffa58f40311319c950b842e2928a5740 Mon Sep 17 00:00:00 2001

1119N/AFrom: matthew green <mrg@eterna.com.au>

1119N/ADate: Mon, 21 Mar 2011 12:17:58 -0400

1119N/ASubject: [PATCH] bug fix for r6xx/r7xx UMS

1119N/A

1119N/ASigned-off-by: Alex Deucher <alexdeucher@gmail.com>

1119N/A---

1119N/A src/r600_exa.c | 4 ++++

1119N/A src/radeon_textured_video.c | 4 ++++

1119N/A 2 files changed, 8 insertions(+), 0 deletions(-)

1119N/A

1119N/Adiff --git a/src/r600_exa.c b/src/r600_exa.c

1119N/Aindex 0ed0ced..7736d24 100644

1119N/A--- a/src/r600_exa.c

1119N/A+++ b/src/r600_exa.c

1119N/A@@ -621,8 +621,12 @@ R600PrepareCopy(PixmapPtr pSrc, PixmapPtr pDst,

1119N/A return FALSE;

1119N/A

1119N/A if (accel_state->same_surface == TRUE) {

1119N/A+#if defined(XF86DRM_MODE)

1119N/A unsigned height = RADEON_ALIGN(pDst->drawable.height,

1119N/A drmmode_get_height_align(pScrn, accel_state->dst_obj.tiling_flags));

1119N/A+#else

1119N/A+ unsigned height = pDst->drawable.height;

1119N/A+#endif

1119N/A unsigned long size = height * accel_state->dst_obj.pitch * pDst->drawable.bitsPerPixel/8;

1119N/A

1119N/A #if defined(XF86DRM_MODE)

1119N/Adiff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c

1119N/Aindex c886ed0..d247db6 100644

1119N/A--- a/src/radeon_textured_video.c

1119N/A+++ b/src/radeon_textured_video.c

1119N/A@@ -248,7 +248,11 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,

1119N/A BoxRec dstBox;

1119N/A int dst_width = width, dst_height = height;

1119N/A int aligned_height;

1119N/A+#ifdef XF86DRM_MODE

1119N/A int h_align = drmmode_get_height_align(pScrn, 0);

1119N/A+#else

1119N/A+ int h_align = 1;

1119N/A+#endif

1119N/A /* make the compiler happy */

1119N/A s2offset = s3offset = srcPitch2 = 0;

1119N/A

1119N/A--

1119N/A1.7.3.2

1119N/A