xf86-video-ati: Branch 'master' - 2 commits

[Alex Deucher]

 src/radeon_atombios.c  |   16 ++++++++++++++++
 src/radeon_exa_funcs.c |    7 ++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit bd03977e320591ca55b1a2fbb32414c53cb3f72e
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Aug 4 15:21:44 2009 -0400

    radeon: fix compile with !kms

diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
index 5d2391f..145f13d 100644
--- a/src/radeon_exa_funcs.c
+++ b/src/radeon_exa_funcs.c
@@ -447,6 +447,7 @@ RADEONBlitChunk(ScrnInfoPtr pScrn, struct radeon_bo *src_bo,
     FINISH_ACCEL();
 }
 
+#if defined(ACCEL_CP) && defined(XF86DRM_MODE)
 static Bool
 RADEONDownloadFromScreenCS(PixmapPtr pSrc, int x, int y, int w,
                            int h, char *dst, int dst_pitch)
@@ -508,6 +509,7 @@ out:
     radeon_bo_unref(scratch);
     return r;
 }
+#endif
 
 static Bool
 RADEONDownloadFromScreenCP(PixmapPtr pSrc, int x, int y, int w, int h,
@@ -647,9 +649,12 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen)
 	info->accel_state->exa->UploadToScreen = RADEONUploadToScreenCP;
 	if (info->accelDFS)
 	    info->accel_state->exa->DownloadFromScreen = RADEONDownloadFromScreenCP;
-    } else {
+    }
+# if defined(XF86DRM_MODE)
+    else {
         info->accel_state->exa->DownloadFromScreen = &RADEONDownloadFromScreenCS;
     }
+# endif
 #endif
 
 #if X_BYTE_ORDER == X_BIG_ENDIAN
commit 4fc1e67e606daf9227e74518c54315b60cd38301
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Aug 4 15:17:39 2009 -0400

    radeon: re-add asus connector quirks
    
    fixes bug 19943

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index bf3bfa0..b1cb559 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1625,6 +1625,22 @@ static void RADEONApplyATOMQuirks(ScrnInfoPtr pScrn, int index)
 	}
     }
 
+    /* ASUS HD 3600 XT board lists the DVI port as HDMI */
+    if ((info->Chipset == PCI_CHIP_RV635_9598) &&
+	(PCI_SUB_VENDOR_ID(info->PciInfo) == 0x1043) &&
+	(PCI_SUB_DEVICE_ID(info->PciInfo) == 0x01da)) {
+	if (info->BiosConnector[index].ConnectorType == CONNECTOR_HDMI_TYPE_A)
+	    info->BiosConnector[index].ConnectorType = CONNECTOR_DVI_D;
+    }
+
+    /* ASUS HD 3450 board lists the DVI port as HDMI */
+    if ((info->Chipset == PCI_CHIP_RV620_95C5) &&
+	(PCI_SUB_VENDOR_ID(info->PciInfo) == 0x1043) &&
+	(PCI_SUB_DEVICE_ID(info->PciInfo) == 0x01e2)) {
+	if (info->BiosConnector[index].ConnectorType == CONNECTOR_HDMI_TYPE_A)
+	    info->BiosConnector[index].ConnectorType = CONNECTOR_DVI_D;
+    }
+
     /* some BIOSes seem to report DAC on HDMI - usually this is a board with
      * HDMI + VGA reporting as HDMI
      */