rpms/xorg-x11-drv-ati/F-10 radeon-6.9.0-posting-fix.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.160, 1.161

[Dave Airlie]

Author: airlied

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

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.9.0-posting-fix.patch 
Log Message:
- radeon-6.9.0-posting-fix.patch - add fix to post the second GPU properly


radeon-6.9.0-posting-fix.patch:

--- NEW FILE radeon-6.9.0-posting-fix.patch ---
commit b01e35168de40d192fd7a9ce6884b9c7419afbd4
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Mon Nov 24 21:06:42 2008 -0500

    Fix up posted logic
    
    noticed by benh on IRC

diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index 1b85e8d..3e3613a 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -98,7 +98,7 @@ radeon_read_bios(ScrnInfoPtr pScrn)
 }
 
 static Bool
-radeon_read_unposted_bios(ScrnInfoPtr pScrn)
+radeon_read_disabled_bios(ScrnInfoPtr pScrn)
 {
     RADEONInfoPtr info     = RADEONPTR(pScrn);
     RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
@@ -293,7 +293,6 @@ RADEONGetBIOSInfo(ScrnInfoPtr pScrn, xf86Int10InfoPtr  pInt10)
     RADEONInfoPtr info     = RADEONPTR(pScrn);
     int tmp;
     unsigned short dptr;
-    Bool posted = TRUE;
 
 #ifdef XSERVER_LIBPCIACCESS
     int size = info->PciInfo->rom_size > RADEON_VBIOS_SIZE ? info->PciInfo->rom_size : RADEON_VBIOS_SIZE;
@@ -310,10 +309,8 @@ RADEONGetBIOSInfo(ScrnInfoPtr pScrn, xf86Int10InfoPtr  pInt10)
 	    info->BIOSAddr = pInt10->BIOSseg << 4;
 	    (void)memcpy(info->VBIOS, xf86int10Addr(pInt10, info->BIOSAddr),
 			 RADEON_VBIOS_SIZE);
-	} else if (!radeon_read_bios(pScrn)) {
-	    (void)radeon_read_unposted_bios(pScrn);
-	    posted = FALSE;
-	}
+	} else if (!radeon_read_bios(pScrn))
+	    (void)radeon_read_disabled_bios(pScrn);
     }
 
     if (info->VBIOS[0] != 0x55 || info->VBIOS[1] != 0xaa) {
@@ -407,17 +404,14 @@ RADEONGetBIOSInfo(ScrnInfoPtr pScrn, xf86Int10InfoPtr  pInt10)
      * so let's work around this for now by only POSTing if none of the
      * CRTCs are enabled
      */
-    if ((!posted) && info->VBIOS) {
-	posted = radeon_card_posted(pScrn);
-    }
-
-    if ((!posted) && info->VBIOS) {
+    if ((!radeon_card_posted(pScrn)) && info->VBIOS) {
 	if (info->IsAtomBios) {
 	    if (!rhdAtomASICInit(info->atomBIOS))
 		xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
 			   "%s: AsicInit failed.\n",__func__);
 	} else {
 #if 0
+	    /* FIX ME */
 	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Attempting to POST via legacy BIOS tables\n");
 	    RADEONGetBIOSInitTableOffsets(pScrn);
 	    RADEONPostCardFromBIOSTables(pScrn);


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-10/xorg-x11-drv-ati.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- xorg-x11-drv-ati.spec	27 Nov 2008 05:36:22 -0000	1.160
+++ xorg-x11-drv-ati.spec	29 Nov 2008 22:10:38 -0000	1.161
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   59%{?dist}
+Release:   60%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -23,6 +23,7 @@
 Patch8:     radeon-6.9.0-quirk-agp.patch
 Patch9:	    radeon-6.9.0-dig1-hdmi.patch
 Patch10:    radeon-6.9.0-exa-dst-a8-r100-r200.patch
+Patch11:    radeon-6.9.0-posting-fix.patch
 
 ExcludeArch: s390 s390x
 
@@ -53,6 +54,7 @@
 %patch8 -p1 -b .quirk
 %patch9 -p1 -b .hdmi
 %patch10 -p1 -b .dsta8
+%patch11 -p1 -b .posting
 
 %build
 autoreconf
@@ -84,6 +86,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Sun Nov 30 2008 Dave Airlie <airlied at redhat.com> 6.9.0-60
+- radeon-6.9.0-posting-fix.patch - add fix to post the second GPU properly
+
 * Thu Nov 27 2008 Dave Airlie <airlied at redhat.com> 6.9.0-59
 - radeon-6.9.0-exa-dst-a8-r100-r200.patch - fix dst a8 with dst alpha (#469556)