File xf86-video-ati-hp.diff of Package xorg-x11-driver-video

Only in xf86-video-ati-6.9.0-mod: hp.diff
diff -urpw xf86-video-ati-6.9.0/src/legacy_output.c xf86-video-ati-6.9.0-mod/src/legacy_output.c
--- xf86-video-ati-6.9.0/src/legacy_output.c	2008-06-25 02:56:40.000000000 -0400
+++ xf86-video-ati-6.9.0-mod/src/legacy_output.c	2009-05-13 23:03:07.000000000 -0400
@@ -795,7 +795,6 @@ RADEONEnableDisplay(xf86OutputPtr output
 		if (!info->output_crt1) {
 		    tmp = INREG(RADEON_CRTC_EXT_CNTL);
 		    tmp &= ~RADEON_CRTC_CRT_ON;
-		    OUTREG(RADEON_CRTC_EXT_CNTL, tmp);
 		    save->crtc_ext_cntl &= ~RADEON_CRTC_CRT_ON;
 		    RADEONDacPowerSet(pScrn, bEnable, (radeon_output->DACType == DAC_PRIMARY));
 		}
diff -urpw xf86-video-ati-6.9.0/src/radeon_driver.c xf86-video-ati-6.9.0-mod/src/radeon_driver.c
--- xf86-video-ati-6.9.0/src/radeon_driver.c	2008-06-23 09:38:42.000000000 -0400
+++ xf86-video-ati-6.9.0-mod/src/radeon_driver.c	2009-05-13 23:06:48.000000000 -0400
@@ -2906,7 +2906,17 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, in
       xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No valid modes.\n");
       goto fail;
    }
+    if (info->ChipFamily == CHIP_FAMILY_RV100 && !pRADEONEnt->HasCRTC2) {
+	int i;
 
+	for (i = 0; i < xf86_config->num_output; i++) {
+	    xf86OutputPtr output = xf86_config->output[i];
+
+	    /* XXX: double check crtc mode */
+	    if ((output->probed_modes != NULL) && (output->crtc == NULL))
+		output->crtc = xf86_config->crtc[0];
+	}
+    }
     ErrorF("after xf86InitialConfiguration\n");
 
     RADEONSetPitch(pScrn);
diff -urpw xf86-video-ati-6.9.0/src/radeon_output.c xf86-video-ati-6.9.0-mod/src/radeon_output.c
--- xf86-video-ati-6.9.0/src/radeon_output.c	2008-06-25 02:56:40.000000000 -0400
+++ xf86-video-ati-6.9.0-mod/src/radeon_output.c	2009-05-13 23:08:59.000000000 -0400
@@ -2742,13 +2742,6 @@ Bool RADEONSetupConnectors(ScrnInfoPtr p
 	    RADEONSetupGenericConnectors(pScrn);
     }
 
-    if (!pRADEONEnt->HasCRTC2) {
-	for (i = 0; i < RADEON_MAX_BIOS_CONNECTOR; i++) {
-	    if (info->BiosConnector[i].ConnectorType == CONNECTOR_VGA)
-		info->BiosConnector[i].DACType = DAC_PRIMARY;
-	}
-    }
-
     /* parse connector table option */
     optstr = (char *)xf86GetOptValString(info->Options, OPTION_CONNECTORTABLE);