Module Name: xsrc
Committed By: mrg
Date: Sun Mar 20 10:40:24 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-ati/dist/src: r600_exa.c
radeon_textured_video.c
Log Message:
avoid drmmode_get_height_align() in non XF86MODE (KMS) code.
fixes this on r6xx/r7xx. (other cards wouldn't have called
into the path that failed.)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 \
xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_video.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c:1.1.1.7 xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c:1.2
--- xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c:1.1.1.7 Sun Mar 20 07:08:03 2011
+++ xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c Sun Mar 20 10:40:24 2011
@@ -621,8 +621,12 @@
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)
Index: xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_video.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_video.c:1.1.1.6 xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_video.c:1.2
--- xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_video.c:1.1.1.6 Sun Mar 20 07:08:03 2011
+++ xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_video.c Sun Mar 20 10:40:24 2011
@@ -248,7 +248,11 @@
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;
