xserver-xorg-video-ati: Changes to 'upstream-unstable'
configure.ac | 2 +-
src/atipciids.h | 3 +++
src/radeon_atombios.c | 10 ++++++++++
src/radeon_dri.c | 3 ++-
src/radeon_driver.c | 29 +++++++++++++++++------------
5 files changed, 33 insertions(+), 14 deletions(-)
New commits:
commit 802073aea2cadc446778902b344221ad2484dc34
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Tue Mar 2 20:46:06 2010 -0500
radeon: bump version for release
diff --git a/configure.ac b/configure.ac
index a19a308..6ff0ddb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-ati],
- 6.12.4,
+ 6.12.5,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ati)
commit 58738d5abb5e6f0622747cb6cdc8d09d4c5b0ade
Author: Dave Airlie <airlied@redhat.com>
Date: Sat Feb 27 16:47:19 2010 +1000
pciids: hopefully fix HP
diff --git a/src/atipciids.h b/src/atipciids.h
index 9bcca95..5f66aa0 100644
--- a/src/atipciids.h
+++ b/src/atipciids.h
@@ -41,7 +41,9 @@
#define PCI_VENDOR_DELL 0x1028
#define PCI_VENDOR_VIA 0x1106
#define PCI_VENDOR_INTEL 0x8086
+#ifndef PCI_VENDOR_HP
#define PCI_VENDOR_HP 0x103c
+#endif
#include "ati_pciids_gen.h"
diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index d67d649..7eceef2 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -51,7 +51,6 @@
#include "radeon_dri.h"
#include "radeon_version.h"
-#include "atipciids.h"
/* X and server generic header files */
#include "xf86.h"
@@ -63,6 +62,8 @@
#include "GL/glxtokens.h"
#include "sarea.h"
+#include "atipciids.h"
+
static size_t radeon_drm_page_size;
#define RADEON_MAX_DRAWABLES 256
commit af13ce94d8631fa3d111de8fdf8765c65fba6bf7
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Feb 26 19:17:28 2010 +1000
pci: add HP vendor id
diff --git a/src/atipciids.h b/src/atipciids.h
index 47c03c7..9bcca95 100644
--- a/src/atipciids.h
+++ b/src/atipciids.h
@@ -41,6 +41,7 @@
#define PCI_VENDOR_DELL 0x1028
#define PCI_VENDOR_VIA 0x1106
#define PCI_VENDOR_INTEL 0x8086
+#define PCI_VENDOR_HP 0x103c
#include "ati_pciids_gen.h"
commit 890ea858b3228e2d519c57b8775f0009aaa2bac4
Author: Cooper Yuan <cooperyuan@gmail.com>
Date: Fri Feb 26 16:14:12 2010 +0800
add more triple-head server ID
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 17253a7..160d084 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1807,19 +1807,24 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn)
case PCI_CHIP_RV100_QY:
case PCI_CHIP_RV100_QZ:
/* DELL triple-head configuration. */
- if ((PCI_SUB_VENDOR_ID(info->PciInfo) == PCI_VENDOR_DELL) &&
- ((PCI_SUB_DEVICE_ID(info->PciInfo) == 0x016c) ||
- (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x016d) ||
- (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x016e) ||
- (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x016f) ||
- (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x0170) ||
- (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x017d) ||
- (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x017e) ||
- (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x0183) ||
- (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x018a) ||
- (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x019a))) {
+ if (((PCI_SUB_VENDOR_ID(info->PciInfo) == PCI_VENDOR_DELL) &&
+ ((PCI_SUB_DEVICE_ID(info->PciInfo) == 0x016c) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x016d) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x016e) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x016f) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x0170) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x017d) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x017e) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x0183) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x018a) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x019a) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x01b1) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x01b2) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x0205))) ||
+ ((PCI_SUB_VENDOR_ID(info->PciInfo) == PCI_VENDOR_HP) &&
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x31fb))) {
info->IsDellServer = TRUE;
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "DELL server detected, force to special setup\n");
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "DELL/HP server detected, force to special setup\n");
}
break;
case PCI_CHIP_RS482_5974:
commit 89e87dcb8ffb8a1ffdd55b9b63c8efef5f42e603
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Thu Feb 18 14:02:00 2010 -0500
RS600: add connector quirk
System lists DVI port as HDMI.
fixes fdo bug 26605
diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 1e7b202..621a110 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1535,6 +1535,16 @@ static void RADEONApplyATOMQuirks(ScrnInfoPtr pScrn, int index)
}
}
+ /* RS600 board lists the DVI port as HDMI */
+ if ((info->Chipset == PCI_CHIP_RS600_7941) &&
+ (PCI_SUB_VENDOR_ID(info->PciInfo) == 0x1849) &&
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x7941)) {
+ if ((info->BiosConnector[index].ConnectorType == CONNECTOR_HDMI_TYPE_A) &&
+ (info->BiosConnector[index].devices & ATOM_DEVICE_DFP3_SUPPORT)) {
+ info->BiosConnector[index].ConnectorType = CONNECTOR_DVI_D;
+ }
+ }
+
/* a-bit f-i90hd - ciaranm on #radeonhd - this board has no DVI */
if ((info->Chipset == PCI_CHIP_RS600_7941) &&
(PCI_SUB_VENDOR_ID(info->PciInfo) == 0x147b) &&
Reply to: