rpms/xorg-x11-drv-ati/devel radeon-git-upstream-fixes.patch, 1.4, 1.5 radeon.xinf, 1.5, 1.6 xorg-x11-drv-ati.spec, 1.79, 1.80
Dave Airlie (airlied)
fedora-extras-commits at redhat.com
Fri Feb 8 04:06:45 UTC 2008
- Previous message (by thread): rpms/gnome-settings-daemon/devel load-xkb.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.5, 1.6
- Next message (by thread): devel/isomd5sum .cvsignore, 1.3, 1.4 isomd5sum.spec, 1.3, 1.4 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: airlied
Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32593
Modified Files:
radeon-git-upstream-fixes.patch radeon.xinf
xorg-x11-drv-ati.spec
Log Message:
* Fri Feb 08 2008 Dave Airlie <airlied at redhat.com> 6.7.197-2
- rebase to upstream git master - add rv67x ids
radeon-git-upstream-fixes.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 radeon-git-upstream-fixes.patch
Index: radeon-git-upstream-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-git-upstream-fixes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- radeon-git-upstream-fixes.patch 3 Feb 2008 23:49:59 -0000 1.4
+++ radeon-git-upstream-fixes.patch 8 Feb 2008 04:06:15 -0000 1.5
@@ -1,3 +1,83 @@
+commit 7f4db96123fdcba9874226352802d702c2a498bd
+Author: Dave Airlie <airlied at redhat.com>
+Date: Fri Feb 8 10:47:10 2008 +1000
+
+ add rv670 pciids
+
+commit e8899b9978291c62a65f468c92f340f65ad5479d
+Author: Alex Deucher <alex at botch2.(none)>
+Date: Thu Feb 7 19:27:38 2008 -0500
+
+ R6xx: fix ddc after my i2c rework
+
+ Seems r6xx does something different for its i2c table,
+ revert to the old behavior for now.
+
+commit 435de6c4e46ff2bebd4cee58888a66b936cd3fdf
+Author: Alex Deucher <alex at samba.(none)>
+Date: Thu Feb 7 19:14:13 2008 -0500
+
+ RADEON: sync up with latest upstream versions
+
+ atombios.h
+ ObjectID.h
+
+commit 692789a293970f70b88ccb6adcf0676d8b495ae2
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Thu Feb 7 18:03:37 2008 +0200
+
+ mach64: factor out BIOS multimedia parsing
+
+commit 933328ffd6d1d872a18d3de8624c4df845a64588
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Thu Feb 7 18:03:03 2008 +0200
+
+ mach64: complement hint for sparc
+
+commit 956c8c81f3ff434930a0cb17b027b2f8e4eeabb2
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Thu Feb 7 18:02:31 2008 +0200
+
+ mach64: consolidate refclk #2
+
+commit dce4cc26a8e2bf53805ec63763243f3ff6b4a6d3
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Thu Feb 7 18:02:17 2008 +0200
+
+ mach64: consolidate refclk #1
+
+commit f7ed807f0d82a7446ebc4acdd4e94df44a675f19
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Thu Feb 7 18:01:59 2008 +0200
+
+ mach64: cosmetic
+
+commit cda1cd198f33c26ef1b51532a2126468369743b8
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Thu Feb 7 18:01:33 2008 +0200
+
+ mach64: factor out BIOS clock parsing
+
+commit 73ff279469be9c7cbf9f533b85fcb553694ff413
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Thu Feb 7 18:00:55 2008 +0200
+
+ mach64: BIOSBase is no longer used
+
+commit caea326cc6f1932bb299f451be013651a5749ea7
+Author: Dave Airlie <airlied at linux.ie>
+Date: Wed Feb 6 06:36:13 2008 +1000
+
+ r300: move fragprog setup code to prepare composite for now
+
+commit 470cd6a401c6a3e8fea981a8fe97c28be3cfb81d
+Author: Dave Airlie <airlied at linux.ie>
+Date: Wed Feb 6 06:04:13 2008 +1000
+
+ r300: remove r300 specific vertex emission
+
+ Set the vertex and fragment engine to expect the mask coords.
+
commit f65e8dfac23adfa199026765fe3a1ea08cf4da67
Author: Alex Deucher <alex at cube.(none)>
Date: Sun Feb 3 00:09:59 2008 -0500
@@ -4763,10 +4843,10 @@
+// EOF
diff --git a/src/AtomBios/includes/ObjectID.h b/src/AtomBios/includes/ObjectID.h
new file mode 100644
-index 0000000..a630c69
+index 0000000..e6d41fe
--- /dev/null
+++ b/src/AtomBios/includes/ObjectID.h
-@@ -0,0 +1,448 @@
+@@ -0,0 +1,484 @@
+/*
+* Copyright 2006-2007 Advanced Micro Devices, Inc.
+*
@@ -4845,6 +4925,8 @@
+#define ENCODER_OBJECT_ID_HDMI_SI1932 0x1B
+#define ENCODER_OBJECT_ID_DP_AN9801 0x1C
+#define ENCODER_OBJECT_ID_DP_DP501 0x1D
++#define ENCODER_OBJECT_ID_INTERNAL_UNIPHY 0x1E
++#define ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA 0x1F
+
+/****************************************************/
+/* Connector Object ID Definition */
@@ -4941,6 +5023,10 @@
+#define ENCODER_MVPU_FPGA_ENUM_ID1 0x2118
+#define ENCODER_INTERNAL_DDI_ENUM_ID1 0x2119
+#define ENCODER_VT1625_ENUM_ID1 0x211A
++#define ENCODER_HDMI_SI1932_ENUM_ID1 0x211B
++#define ENCODER_ENCODER_DP_AN9801_ENUM_ID1 0x211C
++#define ENCODER_DP_DP501_ENUM_ID1 0x211D
++#define ENCODER_INTERNAL_UNIPHY_ENUM_ID1 0x211E
+*/
+#define ENCODER_INTERNAL_LVDS_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
@@ -5073,6 +5159,19 @@
+#define ENCODER_DP_AN9801_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+ ENCODER_OBJECT_ID_DP_AN9801 << OBJECT_ID_SHIFT)
++
++#define ENCODER_INTERNAL_UNIPHY_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
++ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
++ ENCODER_OBJECT_ID_INTERNAL_UNIPHY << OBJECT_ID_SHIFT)
++
++#define ENCODER_INTERNAL_UNIPHY_ENUM_ID2 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
++ GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
++ ENCODER_OBJECT_ID_INTERNAL_UNIPHY << OBJECT_ID_SHIFT)
++
++#define ENCODER_INTERNAL_KLDSCP_LVTMA_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\
++ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
++ ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA << OBJECT_ID_SHIFT)
++
+/****************************************************/
+/* Connector Object ID definition - Shared with BIOS */
+/****************************************************/
@@ -5118,6 +5217,10 @@
+ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D << OBJECT_ID_SHIFT)
+
++#define CONNECTOR_SINGLE_LINK_DVI_D_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
++ GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
++ CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D << OBJECT_ID_SHIFT)
++
+#define CONNECTOR_DUAL_LINK_DVI_D_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT)
@@ -5126,6 +5229,10 @@
+ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_VGA << OBJECT_ID_SHIFT)
+
++#define CONNECTOR_VGA_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
++ GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
++ CONNECTOR_OBJECT_ID_VGA << OBJECT_ID_SHIFT)
++
+#define CONNECTOR_COMPOSITE_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_COMPOSITE << OBJECT_ID_SHIFT)
@@ -5166,6 +5273,10 @@
+ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_PCIE_CONNECTOR << OBJECT_ID_SHIFT)
+
++#define CONNECTOR_PCIE_CONNECTOR_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
++ GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
++ CONNECTOR_OBJECT_ID_PCIE_CONNECTOR << OBJECT_ID_SHIFT)
++
+#define CONNECTOR_CROSSFIRE_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_CROSSFIRE << OBJECT_ID_SHIFT)
@@ -5186,6 +5297,11 @@
+#define CONNECTOR_DISPLAYPORT_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+ CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
++
++#define CONNECTOR_DISPLAYPORT_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
++ GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
++ CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
++
+/****************************************************/
+/* Router Object ID definition - Shared with BIOS */
+/****************************************************/
@@ -5217,10 +5333,10 @@
+
diff --git a/src/AtomBios/includes/atombios.h b/src/AtomBios/includes/atombios.h
new file mode 100644
-index 0000000..863de2e
+index 0000000..16fcf2d
--- /dev/null
+++ b/src/AtomBios/includes/atombios.h
-@@ -0,0 +1,4306 @@
+@@ -0,0 +1,4436 @@
[...2111 lines suppressed...]
info->BiosConnector[2].ConnectorType = CONNECTOR_STV;
info->BiosConnector[2].DACType = DAC_TVDAC;
info->BiosConnector[2].TMDSType = TMDS_NONE;
@@ -32385,7 +33247,7 @@
info->BiosConnector[0].DACType = DAC_TVDAC;
info->BiosConnector[0].TMDSType = TMDS_EXT;
info->BiosConnector[0].ConnectorType = CONNECTOR_DVI_I;
-@@ -2824,11 +1861,11 @@ static Bool RADEONSetupAppleConnectors(ScrnInfoPtr pScrn)
+@@ -2824,11 +1898,11 @@ static Bool RADEONSetupAppleConnectors(ScrnInfoPtr pScrn)
info->BiosConnector[1].ConnectorType = CONNECTOR_STV;
info->BiosConnector[1].DACType = DAC_TVDAC;
info->BiosConnector[1].TMDSType = TMDS_NONE;
@@ -32399,7 +33261,7 @@
info->BiosConnector[0].DACType = DAC_TVDAC;
info->BiosConnector[0].TMDSType = TMDS_INT;
info->BiosConnector[0].ConnectorType = CONNECTOR_DVI_I;
-@@ -2837,26 +1874,26 @@ static Bool RADEONSetupAppleConnectors(ScrnInfoPtr pScrn)
+@@ -2837,26 +1911,26 @@ static Bool RADEONSetupAppleConnectors(ScrnInfoPtr pScrn)
info->BiosConnector[1].ConnectorType = CONNECTOR_STV;
info->BiosConnector[1].DACType = DAC_TVDAC;
info->BiosConnector[1].TMDSType = TMDS_NONE;
@@ -32431,7 +33293,7 @@
info->BiosConnector[2].valid = TRUE;
return TRUE;
default:
-@@ -2873,108 +1910,146 @@ static void RADEONSetupGenericConnectors(ScrnInfoPtr pScrn)
+@@ -2873,108 +1947,146 @@ static void RADEONSetupGenericConnectors(ScrnInfoPtr pScrn)
RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
if (!pRADEONEnt->HasCRTC2) {
@@ -32452,15 +33314,8 @@
- info->BiosConnector[0].DACType = DAC_UNKNOWN;
- info->BiosConnector[0].TMDSType = TMDS_UNKNOWN;
- info->BiosConnector[0].ConnectorType = CONNECTOR_PROPRIETARY;
-+ if (IS_AVIVO_VARIANT) {
-+ if (info->IsMobility) {
-+ info->BiosConnector[0].ddc_i2c = legacy_setup_i2c_bus(0x7e60);
-+ info->BiosConnector[0].DACType = DAC_NONE;
-+ info->BiosConnector[0].TMDSType = TMDS_NONE;
-+ info->BiosConnector[0].ConnectorType = CONNECTOR_LVDS;
-+ info->BiosConnector[0].devices = ATOM_DEVICE_LCD1_SUPPORT;
- info->BiosConnector[0].valid = TRUE;
-
+- info->BiosConnector[0].valid = TRUE;
+-
- /* IGP only has TVDAC */
- if (info->ChipFamily == CHIP_FAMILY_RS400)
- info->BiosConnector[1].DDCType = DDC_CRT2;
@@ -32479,10 +33334,17 @@
- info->BiosConnector[0].DACType = DAC_UNKNOWN;
- info->BiosConnector[0].TMDSType = TMDS_UNKNOWN;
- info->BiosConnector[0].ConnectorType = CONNECTOR_PROPRIETARY;
-- info->BiosConnector[0].valid = TRUE;
--
++ if (IS_AVIVO_VARIANT) {
++ if (info->IsMobility) {
++ info->BiosConnector[0].ddc_i2c = atom_setup_i2c_bus(0x7e60);
++ info->BiosConnector[0].DACType = DAC_NONE;
++ info->BiosConnector[0].TMDSType = TMDS_NONE;
++ info->BiosConnector[0].ConnectorType = CONNECTOR_LVDS;
++ info->BiosConnector[0].devices = ATOM_DEVICE_LCD1_SUPPORT;
+ info->BiosConnector[0].valid = TRUE;
+
- info->BiosConnector[1].DDCType = DDC_VGA;
-+ info->BiosConnector[1].ddc_i2c = legacy_setup_i2c_bus(0x7e40);
++ info->BiosConnector[1].ddc_i2c = atom_setup_i2c_bus(0x7e40);
info->BiosConnector[1].DACType = DAC_PRIMARY;
- info->BiosConnector[1].TMDSType = TMDS_UNKNOWN;
- info->BiosConnector[1].ConnectorType = CONNECTOR_CRT;
@@ -32513,7 +33375,7 @@
info->BiosConnector[1].valid = TRUE;
} else {
- info->BiosConnector[0].DDCType = DDC_DVI;
-+ info->BiosConnector[0].ddc_i2c = legacy_setup_i2c_bus(0x7e50);
++ info->BiosConnector[0].ddc_i2c = atom_setup_i2c_bus(0x7e50);
info->BiosConnector[0].DACType = DAC_TVDAC;
info->BiosConnector[0].TMDSType = TMDS_INT;
info->BiosConnector[0].ConnectorType = CONNECTOR_DVI_I;
@@ -32528,7 +33390,7 @@
- info->BiosConnector[1].valid = TRUE;
-#else
- info->BiosConnector[1].DDCType = DDC_VGA;
-+ info->BiosConnector[1].ddc_i2c = legacy_setup_i2c_bus(0x7e40);
++ info->BiosConnector[1].ddc_i2c = atom_setup_i2c_bus(0x7e40);
info->BiosConnector[1].DACType = DAC_PRIMARY;
info->BiosConnector[1].TMDSType = TMDS_NONE;
- info->BiosConnector[1].ConnectorType = CONNECTOR_CRT;
@@ -32653,7 +33515,7 @@
}
#if defined(__powerpc__)
-@@ -3104,6 +2179,7 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn)
+@@ -3104,6 +2216,7 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn)
int i = 0;
int num_vga = 0;
int num_dvi = 0;
@@ -32661,7 +33523,7 @@
/* We first get the information about all connectors from BIOS.
* This is how the card is phyiscally wired up.
-@@ -3111,9 +2187,9 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn)
+@@ -3111,9 +2224,9 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn)
*/
for (i = 0; i < RADEON_MAX_BIOS_CONNECTOR; i++) {
info->BiosConnector[i].valid = FALSE;
@@ -32674,7 +33536,7 @@
info->BiosConnector[i].ConnectorType = CONNECTOR_NONE;
}
-@@ -3162,15 +2238,9 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn)
+@@ -3162,15 +2275,9 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn)
RADEONSetupGenericConnectors(pScrn);
}
@@ -32692,7 +33554,7 @@
info->BiosConnector[i].DACType = DAC_PRIMARY;
}
}
-@@ -3179,23 +2249,28 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn)
+@@ -3179,23 +2286,28 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn)
optstr = (char *)xf86GetOptValString(info->Options, OPTION_CONNECTORTABLE);
if (optstr) {
@@ -32724,7 +33586,7 @@
}
info->tvdac_use_count = 0;
-@@ -3204,21 +2279,15 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn)
+@@ -3204,21 +2316,15 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn)
if (info->BiosConnector[i].DACType == DAC_TVDAC)
info->tvdac_use_count++;
@@ -32755,7 +33617,7 @@
}
}
}
-@@ -3243,67 +2312,47 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn)
+@@ -3243,67 +2349,47 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn)
}
radeon_output->MonType = MT_UNKNOWN;
radeon_output->ConnectorType = info->BiosConnector[i].ConnectorType;
@@ -32862,7 +33724,7 @@
if (!output) {
return FALSE;
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
-index 7a36242..9d73b96 100644
+index 7a36242..ab6b62a 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -115,6 +115,7 @@ PciChipsets RADEONPciChipsets[] = {
@@ -32873,7 +33735,7 @@
{ PCI_CHIP_RV370_5B64, PCI_CHIP_RV370_5B64, RES_SHARED_VGA },
{ PCI_CHIP_RV370_5B65, PCI_CHIP_RV370_5B65, RES_SHARED_VGA },
{ PCI_CHIP_RV280_5C61, PCI_CHIP_RV280_5C61, RES_SHARED_VGA },
-@@ -135,7 +136,139 @@ PciChipsets RADEONPciChipsets[] = {
+@@ -135,7 +136,145 @@ PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_RV410_5E4C, PCI_CHIP_RV410_5E4C, RES_SHARED_VGA },
{ PCI_CHIP_RV410_5E4D, PCI_CHIP_RV410_5E4D, RES_SHARED_VGA },
{ PCI_CHIP_RV410_5E4F, PCI_CHIP_RV410_5E4F, RES_SHARED_VGA },
@@ -32999,6 +33861,12 @@
+ { PCI_CHIP_RV610_94C9, PCI_CHIP_RV610_94C9, RES_SHARED_VGA },
+ { PCI_CHIP_RV610_94CB, PCI_CHIP_RV610_94CB, RES_SHARED_VGA },
+ { PCI_CHIP_RV610_94CC, PCI_CHIP_RV610_94CC, RES_SHARED_VGA },
++ { PCI_CHIP_RV670_9500, PCI_CHIP_RV670_9500, RES_SHARED_VGA },
++ { PCI_CHIP_RV670_9501, PCI_CHIP_RV670_9501, RES_SHARED_VGA },
++ { PCI_CHIP_RV670_9505, PCI_CHIP_RV670_9505, RES_SHARED_VGA },
++ { PCI_CHIP_RV670_9507, PCI_CHIP_RV670_9507, RES_SHARED_VGA },
++ { PCI_CHIP_RV670_950F, PCI_CHIP_RV670_950F, RES_SHARED_VGA },
++ { PCI_CHIP_RV670_9511, PCI_CHIP_RV670_9511, RES_SHARED_VGA },
+ { PCI_CHIP_RV630_9580, PCI_CHIP_RV630_9580, RES_SHARED_VGA },
+ { PCI_CHIP_RV630_9581, PCI_CHIP_RV630_9581, RES_SHARED_VGA },
+ { PCI_CHIP_RV630_9583, PCI_CHIP_RV630_9583, RES_SHARED_VGA },
@@ -33609,7 +34477,7 @@
extern Bool RADEONScreenInit(int, ScreenPtr, int, char **);
extern Bool RADEONSwitchMode(int, DisplayModePtr, int);
diff --git a/src/radeon_reg.h b/src/radeon_reg.h
-index 6e4e383..eec8784 100644
+index 6e4e383..8d45d7b 100644
--- a/src/radeon_reg.h
+++ b/src/radeon_reg.h
@@ -337,6 +337,8 @@
@@ -33649,7 +34517,7 @@
# define RADEON_TV_N0LO_SHIFT 8
# define RADEON_TV_N0HI_MASK 0x3
# define RADEON_TV_N0HI_SHIFT 21
-@@ -3271,4 +3275,680 @@
+@@ -3271,4 +3275,682 @@
#define RADEON_RS480_UNK_e38 0xe38
#define RADEON_RS480_UNK_e3c 0xe3c
@@ -34145,7 +35013,9 @@
+#define R300_VAP_VTE_CNTL 0x20B0
+#define R300_VAP_PSC_SGN_NORM_CNTL 0x21DC
+#define R300_VAP_PROG_STREAM_CNTL_0 0x2150
++#define R300_VAP_PROG_STREAM_CNTL_1 0x2154
+#define R300_VAP_PROG_STREAM_CNTL_EXT_0 0x21e0
++#define R300_VAP_PROG_STREAM_CNTL_EXT_1 0x21e4
+#define R300_VAP_PVS_CODE_CNTL_0 0x22D0
+#define R300_VAP_PVS_CODE_CNTL_1 0x22D8
+#define R300_VAP_PVS_VECTOR_INDX_REG 0x2200
Index: radeon.xinf
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon.xinf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- radeon.xinf 3 Feb 2008 23:50:00 -0000 1.5
+++ radeon.xinf 8 Feb 2008 04:06:15 -0000 1.6
@@ -447,6 +447,12 @@
alias pcivideo:v00001002d000094C9sv*sd*bc*sc*i* radeon_tp #
alias pcivideo:v00001002d000094CBsv*sd*bc*sc*i* radeon_tp #
alias pcivideo:v00001002d000094CCsv*sd*bc*sc*i* radeon_tp #
+alias pcivideo:v00001002d00009500sv*sd*bc*sc*i* radeon_tp #
+alias pcivideo:v00001002d00009501sv*sd*bc*sc*i* radeon_tp #
+alias pcivideo:v00001002d00009505sv*sd*bc*sc*i* radeon_tp #
+alias pcivideo:v00001002d00009507sv*sd*bc*sc*i* radeon_tp #
+alias pcivideo:v00001002d0000950Fsv*sd*bc*sc*i* radeon_tp #
+alias pcivideo:v00001002d00009511sv*sd*bc*sc*i* radeon_tp #
alias pcivideo:v00001002d00009580sv*sd*bc*sc*i* radeon_tp #
alias pcivideo:v00001002d00009581sv*sd*bc*sc*i* radeon_tp #
alias pcivideo:v00001002d00009583sv*sd*bc*sc*i* radeon_tp #
Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- xorg-x11-drv-ati.spec 4 Feb 2008 00:01:14 -0000 1.79
+++ xorg-x11-drv-ati.spec 8 Feb 2008 04:06:15 -0000 1.80
@@ -5,7 +5,7 @@
Summary: Xorg X11 ati video driver
Name: xorg-x11-drv-ati
Version: 6.7.197
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -84,6 +84,9 @@
%{_mandir}/man4/radeon.4*
%changelog
+* Fri Feb 08 2008 Dave Airlie <airlied at redhat.com> 6.7.197-2
+- rebase to upstream git master - add rv67x ids
+
* Mon Feb 04 2008 Dave Airlie <airlied at redhat.com> 6.7.197-1
- rebase to upstream git master
- add r5xx and r6xx pci ids to xinf
- Previous message (by thread): rpms/gnome-settings-daemon/devel load-xkb.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.5, 1.6
- Next message (by thread): devel/isomd5sum .cvsignore, 1.3, 1.4 isomd5sum.spec, 1.3, 1.4 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list