rpms/xorg-x11-drv-ati/F-12 radeon-git.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.189, 1.190

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12792

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-git.patch 
Log Message:
* Wed Oct 07 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.8.20091006git457646d73
- fix rotate (#527000)


radeon-git.patch:
 drmmode_display.c |    2 +-
 legacy_output.c   |    4 ++--
 radeon_pm.c       |    8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE radeon-git.patch ---
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index f82dec8..a1ec2c2 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -449,7 +449,7 @@ drmmode_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
 					       pScrn->depth,
 					       pScrn->bitsPerPixel,
 					       rotate_pitch,
-					       data);
+					       NULL);
 
 	if (rotate_pixmap == NULL) {
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
diff --git a/src/legacy_output.c b/src/legacy_output.c
index 73c86b9..186cd25 100644
--- a/src/legacy_output.c
+++ b/src/legacy_output.c
@@ -1521,7 +1521,7 @@ RADEONInitTvDacCntl(xf86OutputPtr output, RADEONSavePtr save)
 			       R420_TV_DAC_DACADJ_MASK |
 			       R420_TV_DAC_RDACPD |
 			       R420_TV_DAC_GDACPD |
-			       R420_TV_DAC_GDACPD |
+			       R420_TV_DAC_BDACPD |
 			       R420_TV_DAC_TVENABLE);
     } else {
 	save->tv_dac_cntl = info->SavedReg->tv_dac_cntl &
@@ -1530,7 +1530,7 @@ RADEONInitTvDacCntl(xf86OutputPtr output, RADEONSavePtr save)
 			       RADEON_TV_DAC_DACADJ_MASK |
 			       RADEON_TV_DAC_RDACPD |
 			       RADEON_TV_DAC_GDACPD |
-			       RADEON_TV_DAC_GDACPD);
+			       RADEON_TV_DAC_BDACPD);
     }
 
     save->tv_dac_cntl |= (RADEON_TV_DAC_NBLANK |
diff --git a/src/radeon_pm.c b/src/radeon_pm.c
index fe8f214..d5152c8 100644
--- a/src/radeon_pm.c
+++ b/src/radeon_pm.c
@@ -226,7 +226,7 @@ static void LegacySetClockGating(ScrnInfoPtr pScrn, Bool enable)
 			R300_PIXCLK_TRANS_ALWAYS_ONb      |
 			R300_PIXCLK_TVO_ALWAYS_ONb        |
 			R300_P2G2CLK_ALWAYS_ONb           |
-			R300_P2G2CLK_ALWAYS_ONb);
+			R300_P2G2CLK_DAC_ALWAYS_ONb);
 		OUTPLL(pScrn, RADEON_PIXCLKS_CNTL, tmp);
 	    } else if (info->ChipFamily >= CHIP_FAMILY_RV350) {
 		tmp = INPLL(pScrn, R300_SCLK_CNTL2);
@@ -273,7 +273,7 @@ static void LegacySetClockGating(ScrnInfoPtr pScrn, Bool enable)
 			R300_PIXCLK_TRANS_ALWAYS_ONb      |
 			R300_PIXCLK_TVO_ALWAYS_ONb        |
 			R300_P2G2CLK_ALWAYS_ONb           |
-			R300_P2G2CLK_ALWAYS_ONb);
+			R300_P2G2CLK_DAC_ALWAYS_ONb);
 		OUTPLL(pScrn, RADEON_PIXCLKS_CNTL, tmp);
 
 		tmp = INPLL(pScrn, RADEON_MCLK_MISC);
@@ -454,8 +454,8 @@ static void LegacySetClockGating(ScrnInfoPtr pScrn, Bool enable)
 		     RADEON_PIXCLK_TMDS_ALWAYS_ONb     |
 		     R300_PIXCLK_TRANS_ALWAYS_ONb      |
 		     R300_PIXCLK_TVO_ALWAYS_ONb        |
-		     R300_P2G2CLK_ALWAYS_ONb            |
 		     R300_P2G2CLK_ALWAYS_ONb           |
+		     R300_P2G2CLK_DAC_ALWAYS_ONb       |
 		     R300_DISP_DAC_PIXCLK_DAC2_BLANK_OFF);
 	    OUTPLL(pScrn, RADEON_PIXCLKS_CNTL, tmp);
 	} else if (info->ChipFamily >= CHIP_FAMILY_RV350) {
@@ -507,8 +507,8 @@ static void LegacySetClockGating(ScrnInfoPtr pScrn, Bool enable)
 		     RADEON_PIXCLK_TMDS_ALWAYS_ONb     |
 		     R300_PIXCLK_TRANS_ALWAYS_ONb      |
 		     R300_PIXCLK_TVO_ALWAYS_ONb        |
-		     R300_P2G2CLK_ALWAYS_ONb            |
 		     R300_P2G2CLK_ALWAYS_ONb           |
+		     R300_P2G2CLK_DAC_ALWAYS_ONb       |
 		     R300_DISP_DAC_PIXCLK_DAC2_BLANK_OFF);
 	    OUTPLL(pScrn, RADEON_PIXCLKS_CNTL, tmp);
 	}  else {


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-12/xorg-x11-drv-ati.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -p -r1.189 -r1.190
--- xorg-x11-drv-ati.spec	5 Oct 2009 21:48:03 -0000	1.189
+++ xorg-x11-drv-ati.spec	7 Oct 2009 07:31:42 -0000	1.190
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.13.0
-Release:   0.7.%{gitdate}git%{gitversion}%{?dist}
+Release:   0.8.%{gitdate}git%{gitversion}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -18,6 +18,7 @@ Source0: %{tarball}-%{gitdate}.tar.xz
 # unlike the other drivers, radeon.xinf is generated
 Source1:    mkxinf
 
+Patch1:	    radeon-git.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch10:    radeon-6.12.2-lvds-default-modes.patch
 Patch13:    fix-default-modes.patch
@@ -45,6 +46,7 @@ X.Org X11 ati video driver.
 
 %prep
 %setup -q -n %{tarball}-%{gitdate}
+%patch1 -p1 -b .git
 %patch6 -p1 -b .bgnr
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
@@ -82,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed Oct 07 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.8.20091006git457646d73
+- fix rotate (#527000)
+
 * Tue Oct 06 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.7.20091006git457646d73
 - resnapshot with VT switch fixes and mixed issue was in server which is fixed