Module Name: xsrc
Committed By: mrg
Date: Sat Jul 17 07:55:35 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-ati/dist/src: r6xx_accel.c
xsrc/external/mit/xf86-video-ati/include: config.h
Log Message:
(a) - don't enable KMS support
(b) - fix compile error when XF86_DRMMODE is not set
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-ati/include/config.h
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/r6xx_accel.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c:1.1.1.4 xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c:1.2
--- xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c:1.1.1.4 Sat Jul 17 06:31:47 2010
+++ xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c Sat Jul 17 07:55:34 2010
@@ -1262,10 +1262,10 @@
void r600_vb_no_space(ScrnInfoPtr pScrn, int vert_size)
{
-#ifdef XF86DRM_MODE
RADEONInfoPtr info = RADEONPTR(pScrn);
struct radeon_accel_state *accel_state = info->accel_state;
+#ifdef XF86DRM_MODE
if (info->cs) {
if (accel_state->vb_bo) {
if (accel_state->vb_start_op != accel_state->vb_offset) {
Index: xsrc/external/mit/xf86-video-ati/include/config.h
diff -u xsrc/external/mit/xf86-video-ati/include/config.h:1.7 xsrc/external/mit/xf86-video-ati/include/config.h:1.8
--- xsrc/external/mit/xf86-video-ati/include/config.h:1.7 Sat Jul 17 07:03:56 2010
+++ xsrc/external/mit/xf86-video-ati/include/config.h Sat Jul 17 07:55:34 2010
@@ -119,7 +119,7 @@
#define XF86DRI_DEVEL 1
/* DRM kernel modesetting */
-#define XF86DRM_MODE 1
+/* #define XF86DRM_MODE 1 */
/* X server has built-in mode code */
#define XMODES 1
