rpms/xorg-x11-drv-ati/F-8 radeon-6.7.196-atombios-support.patch, 1.1, 1.2 xorg-x11-drv-ati.spec, 1.70, 1.71

[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-serv15829

Modified Files:
	radeon-6.7.196-atombios-support.patch xorg-x11-drv-ati.spec 
Log Message:
* Thu Dec 06 2007 Dave Airlie <airlied at redhat.com> 6.7.196-4
- radeon-6.7.196-atombios-support.patch - update for ppc build


radeon-6.7.196-atombios-support.patch:

Index: radeon-6.7.196-atombios-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-8/radeon-6.7.196-atombios-support.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- radeon-6.7.196-atombios-support.patch	6 Dec 2007 05:47:11 -0000	1.1
+++ radeon-6.7.196-atombios-support.patch	6 Dec 2007 08:26:32 -0000	1.2
@@ -14858,7 +14858,7 @@
  	} else {
  	    if (output->MonInfo)
 diff --git a/src/radeon_output.c b/src/radeon_output.c
-index 11a2a8a..19107be 100644
+index 11a2a8a..15b4ddf 100644
 --- a/src/radeon_output.c
 +++ b/src/radeon_output.c
 @@ -46,7 +46,7 @@
@@ -14960,7 +14960,7 @@
      xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
      RADEONOutputPrivatePtr radeon_output;
      xf86OutputPtr output;
-@@ -261,17 +259,47 @@ void RADEONPrintPortMap(ScrnInfoPtr pScrn)
+@@ -261,32 +259,61 @@ void RADEONPrintPortMap(ScrnInfoPtr pScrn)
  	radeon_output = output->driver_private;
  
  	xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
@@ -14975,11 +14975,11 @@
  		   TMDSTypeName[radeon_output->TMDSType+1],
 -		   DDCTypeName[radeon_output->DDCType]);
 +		   radeon_output->ddc_line);
-+    }
-+
-+}
-+
-+static RADEONMonitorType
+     }
+ 
+ }
+ 
+ static RADEONMonitorType
 +avivo_display_ddc_connected(ScrnInfoPtr pScrn, xf86OutputPtr output)
 +{
 +    RADEONInfoPtr info = RADEONPTR(pScrn);
@@ -14991,7 +14991,7 @@
 +	AVIVOI2CDoLock(pScrn, AVIVO_I2C_ENABLE, radeon_output->ddc_line);
 +	MonInfo = xf86OutputGetEDID(output, radeon_output->pI2CBus);
 +	AVIVOI2CDoLock(pScrn, AVIVO_I2C_DISABLE, radeon_output->ddc_line);
-     }
++    }
 +    if (MonInfo) {
 +	if (!xf86ReturnOptValBool(info->Options, OPTION_IGNORE_EDID, FALSE))
 +	    xf86OutputSetEDID(output, MonInfo);
@@ -15007,12 +15007,12 @@
 +    
 +    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 +	       "DDC Type: 0x%x, Detected Monitor Type: %d\n", radeon_output->ddc_line, MonType);
- 
++
 +    return MonType;
- }
- 
- static RADEONMonitorType
-@@ -279,14 +307,13 @@ RADEONDisplayDDCConnected(ScrnInfoPtr pScrn, xf86OutputPtr output)
++}
++
++static RADEONMonitorType
+ RADEONDisplayDDCConnected(ScrnInfoPtr pScrn, xf86OutputPtr output)
  {
      RADEONInfoPtr info = RADEONPTR(pScrn);
      unsigned char *RADEONMMIO = info->MMIO;
@@ -15723,7 +15723,8 @@
 +	info->BiosConnector[0].ddc_line = RADEON_GPIO_DVI_DDC;
  	info->BiosConnector[0].DACType = DAC_NONE;
  	info->BiosConnector[0].TMDSType = TMDS_NONE;
- 	info->BiosConnector[0].ConnectorType = CONNECTOR_CRT;
+-	info->BiosConnector[0].ConnectorType = CONNECTOR_CRT;
++	info->BiosConnector[0].ConnectorType = CONNECTOR_VGA;
  	info->BiosConnector[0].valid = TRUE;
  
 -	info->BiosConnector[1].DDCType = DDC_VGA;
@@ -15759,7 +15760,7 @@
  	info->BiosConnector[0].DACType = DAC_TVDAC;
  	info->BiosConnector[0].TMDSType = TMDS_INT;
  	info->BiosConnector[0].ConnectorType = CONNECTOR_DVI_I;
-@@ -2786,7 +2931,7 @@ static Bool RADEONSetupAppleConnectors(ScrnInfoPtr pScrn)
+@@ -2786,26 +2931,26 @@ static Bool RADEONSetupAppleConnectors(ScrnInfoPtr pScrn)
  	info->BiosConnector[1].ConnectorType = CONNECTOR_STV;
  	info->BiosConnector[1].DACType = DAC_TVDAC;
  	info->BiosConnector[1].TMDSType = TMDS_NONE;
@@ -15768,6 +15769,29 @@
  	info->BiosConnector[1].valid = TRUE;
  	return TRUE;
      case RADEON_MAC_IMAC_G5_ISIGHT:
+-	info->BiosConnector[0].DDCType = DDC_MONID;
++	info->BiosConnector[0].ddc_line = RADEON_GPIO_MONID;
+ 	info->BiosConnector[0].DACType = DAC_NONE;
+ 	info->BiosConnector[0].TMDSType = TMDS_INT;
+ 	info->BiosConnector[0].ConnectorType = CONNECTOR_DVI_D;
+ 	info->BiosConnector[0].valid = TRUE;
+ 
+-	info->BiosConnector[1].DDCType = DDC_DVI;
++	info->BiosConnector[1].ddc_line = RADEON_GPIO_DVI_DDC;
+ 	info->BiosConnector[1].DACType = DAC_TVDAC;
+ 	info->BiosConnector[1].TMDSType = TMDS_NONE;
+-	info->BiosConnector[1].ConnectorType = CONNECTOR_CRT;
++	info->BiosConnector[1].ConnectorType = CONNECTOR_VGA;
+ 	info->BiosConnector[1].valid = TRUE;
+ 
+ 	info->BiosConnector[2].ConnectorType = CONNECTOR_STV;
+ 	info->BiosConnector[2].DACType = DAC_TVDAC;
+ 	info->BiosConnector[2].TMDSType = TMDS_NONE;
+-	info->BiosConnector[2].DDCType = DDC_NONE_DETECTED;
++	info->BiosConnector[2].ddc_line = 0;
+ 	info->BiosConnector[2].valid = TRUE;
+ 	return TRUE;
+     default:
 @@ -2822,108 +2967,146 @@ static void RADEONSetupGenericConnectors(ScrnInfoPtr pScrn)
      RADEONEntPtr pRADEONEnt  = RADEONEntPriv(pScrn);
  


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.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- xorg-x11-drv-ati.spec	6 Dec 2007 05:49:04 -0000	1.70
+++ xorg-x11-drv-ati.spec	6 Dec 2007 08:26:32 -0000	1.71
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.7.196
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -89,6 +89,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Dec 06 2007 Dave Airlie <airlied at redhat.com> 6.7.196-4
+- radeon-6.7.196-atombios-support.patch - update for ppc build
+
 * Thu Dec 06 2007 Dave Airlie <airlied at redhat.com> 6.7.196-3
 - radeon-6.7.196-atombios-support.patch - Add atombios support
 - update git fix to upstream latest tree