rpms/xorg-x11-drv-ati/F-8 radeon-git-upstream-fixes2.patch, 1.2, 1.3 xorg-x11-drv-ati.spec, 1.78, 1.79

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14896

Modified Files:
	radeon-git-upstream-fixes2.patch xorg-x11-drv-ati.spec 
Log Message:
* Wed Apr 02 2008 Dave Airlie <airlied at redhat.com> 6.8.0-4
- Fix issues with dualhead vs rotation


radeon-git-upstream-fixes2.patch:

Index: radeon-git-upstream-fixes2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-8/radeon-git-upstream-fixes2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- radeon-git-upstream-fixes2.patch	31 Mar 2008 04:47:45 -0000	1.2
+++ radeon-git-upstream-fixes2.patch	2 Apr 2008 04:57:34 -0000	1.3
@@ -1,3 +1,32 @@
+commit a8593482c1f2e0f2dbac06c2e5325ba8c83ed9ff
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 2 09:58:05 2008 +1000
+
+    atombios: fix the dual-head hopefully.
+    
+    tested on r600 with DVI and VGA
+
+commit 61d883d116fab3e9b513432d65e705afc5bb39f1
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 2 09:57:38 2008 +1000
+
+    Revert "Revert "atombios: fixup the width/height to use the mode values not the scrn ones""
+    
+    This reverts commit fc9af578997b6f22ee8b17e83f37d98689291b0e.
+    
+    I see your revert and raise you one...
+
+commit fc9af578997b6f22ee8b17e83f37d98689291b0e
+Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
+Date:   Tue Apr 1 09:25:45 2008 -0400
+
+    Revert "atombios: fixup the width/height to use the mode values not the scrn ones"
+    
+    This reverts commit c2b1c8b706a6c7c1fd0af80091958473133d54e7.
+    
+    These registers hold surface size.  Using the mode values
+    breaks dualhead.
+
 commit 959509dd54de053f526b534e379a46934127231f
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Mar 31 14:29:44 2008 +1000
@@ -1002,7 +1031,7 @@
  
  static XF86ModuleVersionInfo ATIVersionRec =
 diff --git a/src/atombios_crtc.c b/src/atombios_crtc.c
-index bc2df18..229ca75 100644
+index bc2df18..08f8386 100644
 --- a/src/atombios_crtc.c
 +++ b/src/atombios_crtc.c
 @@ -1,10 +1,5 @@
@@ -1311,14 +1340,16 @@
  
  	OUTREG(AVIVO_D1GRPH_SURFACE_OFFSET_X + radeon_crtc->crtc_offset, 0);
  	OUTREG(AVIVO_D1GRPH_SURFACE_OFFSET_Y + radeon_crtc->crtc_offset, 0);
- 	OUTREG(AVIVO_D1GRPH_X_START + radeon_crtc->crtc_offset, 0);
- 	OUTREG(AVIVO_D1GRPH_Y_START + radeon_crtc->crtc_offset, 0);
+-	OUTREG(AVIVO_D1GRPH_X_START + radeon_crtc->crtc_offset, 0);
+-	OUTREG(AVIVO_D1GRPH_Y_START + radeon_crtc->crtc_offset, 0);
 -	OUTREG(AVIVO_D1GRPH_X_END + radeon_crtc->crtc_offset,
 -	       crtc->scrn->virtualX);
 -	OUTREG(AVIVO_D1GRPH_Y_END + radeon_crtc->crtc_offset,
 -	       crtc->scrn->virtualY);
-+	OUTREG(AVIVO_D1GRPH_X_END + radeon_crtc->crtc_offset, mode->HDisplay);
-+	OUTREG(AVIVO_D1GRPH_Y_END + radeon_crtc->crtc_offset, mode->VDisplay);
++	OUTREG(AVIVO_D1GRPH_X_START + radeon_crtc->crtc_offset, x);
++	OUTREG(AVIVO_D1GRPH_Y_START + radeon_crtc->crtc_offset, y);
++	OUTREG(AVIVO_D1GRPH_X_END + radeon_crtc->crtc_offset, x + mode->HDisplay);
++	OUTREG(AVIVO_D1GRPH_Y_END + radeon_crtc->crtc_offset, y + mode->VDisplay);
  	OUTREG(AVIVO_D1GRPH_PITCH + radeon_crtc->crtc_offset,
  	       crtc->scrn->displayWidth);
  	OUTREG(AVIVO_D1GRPH_ENABLE + radeon_crtc->crtc_offset, 1);


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-8/xorg-x11-drv-ati.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- xorg-x11-drv-ati.spec	31 Mar 2008 04:47:45 -0000	1.78
+++ xorg-x11-drv-ati.spec	2 Apr 2008 04:57:34 -0000	1.79
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.8.0
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -88,6 +88,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed Apr 02 2008 Dave Airlie <airlied at redhat.com> 6.8.0-4
+- Fix issues with dualhead vs rotation
+
 * Mon Mar 31 2008 Dave Airlie <airlied at redhat.com> 6.8.0-3
 - Add latest fixes from rawhide tree