xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_textured_video.c |   18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 2918df3a312fc600e83f84c298b9653d2eb3a8d5
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Oct 13 17:16:04 2010 -0400

    evergreen: increase XV_CRTC Xv attribute range
    
    Cover all 6 possible crtcs.

diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
index 0d8d2aa..36bcb56 100644
--- a/src/radeon_textured_video.c
+++ b/src/radeon_textured_video.c
@@ -614,6 +614,18 @@ static XF86AttributeRec Attributes_r600[NUM_ATTRIBUTES_R600+1] =
     {0, 0, 0, NULL}
 };
 
+static XF86AttributeRec Attributes_eg[NUM_ATTRIBUTES_R600+1] =
+{
+    {XvSettable | XvGettable, 0, 1, "XV_VSYNC"},
+    {XvSettable | XvGettable, -1000, 1000, "XV_BRIGHTNESS"},
+    {XvSettable | XvGettable, -1000, 1000, "XV_CONTRAST"},
+    {XvSettable | XvGettable, -1000, 1000, "XV_SATURATION"},
+    {XvSettable | XvGettable, -1000, 1000, "XV_HUE"},
+    {XvSettable | XvGettable, 0, 1, "XV_COLORSPACE"},
+    {XvSettable | XvGettable, -1, 5, "XV_CRTC"},
+    {0, 0, 0, NULL}
+};
+
 static Atom xvBicubic;
 static Atom xvVSync;
 static Atom xvBrightness, xvContrast, xvSaturation, xvHue;
@@ -811,7 +823,11 @@ RADEONSetupImageTexturedVideo(ScreenPtr pScreen)
     pPortPriv =
 	(RADEONPortPrivPtr)(&adapt->pPortPrivates[num_texture_ports]);
 
-    if (IS_R600_3D) {
+    if (IS_EVERGREEN_3D) {
+	adapt->pAttributes = Attributes_eg;
+	adapt->nAttributes = NUM_ATTRIBUTES_R600;
+    }
+    else if (IS_R600_3D) {
 	adapt->pAttributes = Attributes_r600;
 	adapt->nAttributes = NUM_ATTRIBUTES_R600;
     }