xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_video.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 47134ca77988f8c3b42d55ac4fcbb5dc182878d4
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Mar 26 17:18:47 2009 -0400

    radeon: re-enable r/g/b intensity attributes for overlay
    
    Noticed by sroland on IRC.

diff --git a/src/radeon_video.c b/src/radeon_video.c
index a2a4696..42aa036 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -1067,11 +1067,11 @@ static void RADEONSetTransform (ScrnInfoPtr pScrn,
     OvGCr = CAdjGCr * gamma_curve_r100[gamma].OvGammaCont;
     OvBCb = CAdjBCb * gamma_curve_r100[gamma].OvGammaCont;
     OvBCr = CAdjBCr * gamma_curve_r100[gamma].OvGammaCont;
-    OvROff = CAdjOff * gamma_curve_r100[gamma].OvGammaCont - 
+    OvROff = RedAdj + CAdjOff * gamma_curve_r100[gamma].OvGammaCont - 
 	OvLuma * Loff - (OvRCb + OvRCr) * Coff;
-    OvGOff = CAdjOff * gamma_curve_r100[gamma].OvGammaCont - 
+    OvGOff = GreenAdj + CAdjOff * gamma_curve_r100[gamma].OvGammaCont - 
 	OvLuma * Loff - (OvGCb + OvGCr) * Coff;
-    OvBOff = CAdjOff * gamma_curve_r100[gamma].OvGammaCont - 
+    OvBOff = BlueAdj + CAdjOff * gamma_curve_r100[gamma].OvGammaCont - 
 	OvLuma * Loff - (OvBCb + OvBCr) * Coff;
 #if 0 /* default constants */
     OvROff = -888.5;