xf86-video-ati: Branch 'master' - 2 commits

[Alex Deucher]

 man/radeon.man              |    2 +-
 src/radeon_crtc.c           |   26 +++++---------------------
 src/radeon_textured_video.c |    2 +-
 3 files changed, 7 insertions(+), 23 deletions(-)

New commits:
commit 4651d77211b508cb6b76931807780e317f232220
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Jun 16 12:28:36 2010 -0400

    radeon: fix depth 16 with ums
    
    Fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=28494
    https://bugzilla.redhat.com/show_bug.cgi?id=554967
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index a4a3302..bc23ee5 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -564,28 +564,12 @@ radeon_crtc_gamma_set(xf86CrtcPtr crtc, uint16_t *red, uint16_t *green,
 		      uint16_t *blue, int size)
 {
     RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
-    ScrnInfoPtr		pScrn = crtc->scrn;
-    int i, j;
-
-    if (pScrn->depth == 16) {
-	for (i = 0; i < 64; i++) {
-	    if (i <= 31) {
-		for (j = 0; j < 8; j++) {
-		    radeon_crtc->lut_r[i * 8 + j] = red[i] >> 6;
-		    radeon_crtc->lut_b[i * 8 + j] = blue[i] >> 6;
-		}
-	    }
+    int i;
 
-	    for (j = 0; j < 4; j++) {
-		radeon_crtc->lut_g[i * 4 + j] = green[i] >> 6;
-	    }
-	}
-    } else {
-	for (i = 0; i < 256; i++) {
-	    radeon_crtc->lut_r[i] = red[i] >> 6;
-	    radeon_crtc->lut_g[i] = green[i] >> 6;
-	    radeon_crtc->lut_b[i] = blue[i] >> 6;
-	}
+    for (i = 0; i < 256; i++) {
+	radeon_crtc->lut_r[i] = red[i] >> 6;
+	radeon_crtc->lut_g[i] = green[i] >> 6;
+	radeon_crtc->lut_b[i] = blue[i] >> 6;
     }
 
     radeon_crtc_load_lut(crtc);
commit 1e1d6a515428b6884fea586d180346fc74ef75a1
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Jun 16 12:20:03 2010 -0400

    r3xx-r5xx Xv: disable bicubic filtering by default
    
    - makes Xv more consistent with r1xx/r2xx/r6xx/r7xx
    - Xv attributes like brightness, contrast, hue, etc. only work
    when bicubic is disabled.
    - avoids performance issues on some systems when sampling from textures
    in GART with kms.
    - It can be re-enabled with using xvattr
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/man/radeon.man b/man/radeon.man
index 05b7d16..673ab03 100644
--- a/man/radeon.man
+++ b/man/radeon.man
@@ -656,7 +656,7 @@ sizes are scaled to more than double to avoid blurred output.  Bicubic
 filtering is not currently compatible with other Xv attributes like hue,
 contrast, and brightness, and must be disabled to use those attributes.
 The default is
-.B 'auto'(2).
+.B 'off'(0).
 
 .SH SEE ALSO
 __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
index 1490ccb..5c52a5f 100644
--- a/src/radeon_textured_video.c
+++ b/src/radeon_textured_video.c
@@ -843,7 +843,7 @@ RADEONSetupImageTexturedVideo(ScreenPtr pScreen)
 	pPriv->videoStatus = 0;
 	pPriv->currentBuffer = 0;
 	pPriv->doubleBuffer = 0;
-	pPriv->bicubic_state = BICUBIC_AUTO;
+	pPriv->bicubic_state = BICUBIC_OFF;
 	pPriv->vsync = TRUE;
 	pPriv->brightness = 0;
 	pPriv->contrast = 0;