xf86-video-ati: Branch 'master' - 4 commits
Alex Deucher
agd5f at kemper.freedesktop.org
Fri May 2 14:50:34 PDT 2014
configure.ac | 2 +-
man/radeon.man | 3 +++
src/ati_pciids_gen.h | 16 ++++++++++++++++
src/pcidb/ati_pciids.csv | 16 ++++++++++++++++
src/radeon_chipinfo_gen.h | 16 ++++++++++++++++
src/radeon_chipset_gen.h | 16 ++++++++++++++++
src/radeon_kms.c | 4 ++--
src/radeon_pci_chipset_gen.h | 16 ++++++++++++++++
src/radeon_pci_device_match_gen.h | 16 ++++++++++++++++
src/radeon_probe.h | 1 +
10 files changed, 103 insertions(+), 3 deletions(-)
New commits:
commit be1469cc23aba46daf3293b3d09c5f2e792e7f42
Author: Alex Deucher <alexander.deucher at amd.com>
Date: Fri May 2 17:48:07 2014 -0400
radeon: enable tiling for mullins
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index fb93f8a..5e052e4 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -889,13 +889,13 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
* with proper bit, in the meantime you need to set tiling option in
* xorg configuration files
*/
- info->ChipFamily <= CHIP_FAMILY_HAWAII &&
+ info->ChipFamily <= CHIP_FAMILY_MULLINS &&
!info->is_fast_fb;
/* 2D color tiling */
if (info->ChipFamily >= CHIP_FAMILY_R600) {
info->allowColorTiling2D = xf86ReturnOptValBool(info->Options, OPTION_COLOR_TILING_2D,
- info->ChipFamily <= CHIP_FAMILY_HAWAII);
+ info->ChipFamily <= CHIP_FAMILY_MULLINS);
}
if (info->ChipFamily >= CHIP_FAMILY_R600) {
commit 2ae8e4b8d12f5c9bab6655eb8cd3c5c1d5cfb10e
Author: Samuel Li <samuel.li at amd.com>
Date: Tue Nov 12 15:30:42 2013 -0500
radeon: add Mullins pci ids.
Signed-off-by: Samuel Li <samuel.li at amd.com>
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index eb57992..94c8fc8 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -722,6 +722,22 @@
#define PCI_CHIP_KABINI_983D 0x983D
#define PCI_CHIP_KABINI_983E 0x983E
#define PCI_CHIP_KABINI_983F 0x983F
+#define PCI_CHIP_MULLINS_9850 0x9850
+#define PCI_CHIP_MULLINS_9851 0x9851
+#define PCI_CHIP_MULLINS_9852 0x9852
+#define PCI_CHIP_MULLINS_9853 0x9853
+#define PCI_CHIP_MULLINS_9854 0x9854
+#define PCI_CHIP_MULLINS_9855 0x9855
+#define PCI_CHIP_MULLINS_9856 0x9856
+#define PCI_CHIP_MULLINS_9857 0x9857
+#define PCI_CHIP_MULLINS_9858 0x9858
+#define PCI_CHIP_MULLINS_9859 0x9859
+#define PCI_CHIP_MULLINS_985A 0x985A
+#define PCI_CHIP_MULLINS_985B 0x985B
+#define PCI_CHIP_MULLINS_985C 0x985C
+#define PCI_CHIP_MULLINS_985D 0x985D
+#define PCI_CHIP_MULLINS_985E 0x985E
+#define PCI_CHIP_MULLINS_985F 0x985F
#define PCI_CHIP_KAVERI_1304 0x1304
#define PCI_CHIP_KAVERI_1305 0x1305
#define PCI_CHIP_KAVERI_1306 0x1306
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 8469a2a..e334230 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -723,6 +723,22 @@
"0x983D","KABINI_983D","KABINI",,1,,,1,"KABINI"
"0x983E","KABINI_983E","KABINI",,1,,,1,"KABINI"
"0x983F","KABINI_983F","KABINI",,1,,,1,"KABINI"
+"0x9850","MULLINS_9850","MULLINS",1,1,,,1,"MULLINS"
+"0x9851","MULLINS_9851","MULLINS",1,1,,,1,"MULLINS"
+"0x9852","MULLINS_9852","MULLINS",1,1,,,1,"MULLINS"
+"0x9853","MULLINS_9853","MULLINS",1,1,,,1,"MULLINS"
+"0x9854","MULLINS_9854","MULLINS",1,1,,,1,"MULLINS"
+"0x9845","MULLINS_9855","MULLINS",1,1,,,1,"MULLINS"
+"0x9856","MULLINS_9856","MULLINS",1,1,,,1,"MULLINS"
+"0x9857","MULLINS_9857","MULLINS",1,1,,,1,"MULLINS"
+"0x9858","MULLINS_9858","MULLINS",1,1,,,1,"MULLINS"
+"0x9859","MULLINS_9859","MULLINS",1,1,,,1,"MULLINS"
+"0x985A","MULLINS_985A","MULLINS",1,1,,,1,"MULLINS"
+"0x985B","MULLINS_985B","MULLINS",1,1,,,1,"MULLINS"
+"0x985C","MULLINS_985C","MULLINS",1,1,,,1,"MULLINS"
+"0x985D","MULLINS_985D","MULLINS",1,1,,,1,"MULLINS"
+"0x985E","MULLINS_985E","MULLINS",1,1,,,1,"MULLINS"
+"0x985F","MULLINS_985F","MULLINS",1,1,,,1,"MULLINS"
"0x1304","KAVERI_1304","KAVERI",1,1,,,1,"KAVERI"
"0x1305","KAVERI_1305","KAVERI",,1,,,1,"KAVERI"
"0x1306","KAVERI_1306","KAVERI",1,1,,,1,"KAVERI"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index fc9474b..4f6e3bc 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -642,6 +642,22 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x983D, CHIP_FAMILY_KABINI, 0, 1, 0, 0, 1 },
{ 0x983E, CHIP_FAMILY_KABINI, 0, 1, 0, 0, 1 },
{ 0x983F, CHIP_FAMILY_KABINI, 0, 1, 0, 0, 1 },
+ { 0x9850, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9851, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9852, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9853, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9854, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9855, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9856, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9857, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9858, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9859, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x985A, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x985B, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x985C, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x985D, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x985E, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x985F, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
{ 0x1304, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
{ 0x1305, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
{ 0x1306, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index afab6b0..03a413e 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -642,6 +642,22 @@ SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_KABINI_983D, "KABINI" },
{ PCI_CHIP_KABINI_983E, "KABINI" },
{ PCI_CHIP_KABINI_983F, "KABINI" },
+ { PCI_CHIP_MULLINS_9850, "MULLINS" },
+ { PCI_CHIP_MULLINS_9851, "MULLINS" },
+ { PCI_CHIP_MULLINS_9852, "MULLINS" },
+ { PCI_CHIP_MULLINS_9853, "MULLINS" },
+ { PCI_CHIP_MULLINS_9854, "MULLINS" },
+ { PCI_CHIP_MULLINS_9855, "MULLINS" },
+ { PCI_CHIP_MULLINS_9856, "MULLINS" },
+ { PCI_CHIP_MULLINS_9857, "MULLINS" },
+ { PCI_CHIP_MULLINS_9858, "MULLINS" },
+ { PCI_CHIP_MULLINS_9859, "MULLINS" },
+ { PCI_CHIP_MULLINS_985A, "MULLINS" },
+ { PCI_CHIP_MULLINS_985B, "MULLINS" },
+ { PCI_CHIP_MULLINS_985C, "MULLINS" },
+ { PCI_CHIP_MULLINS_985D, "MULLINS" },
+ { PCI_CHIP_MULLINS_985E, "MULLINS" },
+ { PCI_CHIP_MULLINS_985F, "MULLINS" },
{ PCI_CHIP_KAVERI_1304, "KAVERI" },
{ PCI_CHIP_KAVERI_1305, "KAVERI" },
{ PCI_CHIP_KAVERI_1306, "KAVERI" },
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index da4440b..a9b186c 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -642,6 +642,22 @@ static PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_KABINI_983D, PCI_CHIP_KABINI_983D, RES_SHARED_VGA },
{ PCI_CHIP_KABINI_983E, PCI_CHIP_KABINI_983E, RES_SHARED_VGA },
{ PCI_CHIP_KABINI_983F, PCI_CHIP_KABINI_983F, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_9850, PCI_CHIP_MULLINS_9850, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_9851, PCI_CHIP_MULLINS_9851, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_9852, PCI_CHIP_MULLINS_9852, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_9853, PCI_CHIP_MULLINS_9853, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_9854, PCI_CHIP_MULLINS_9854, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_9855, PCI_CHIP_MULLINS_9855, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_9856, PCI_CHIP_MULLINS_9856, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_9857, PCI_CHIP_MULLINS_9857, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_9858, PCI_CHIP_MULLINS_9858, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_9859, PCI_CHIP_MULLINS_9859, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_985A, PCI_CHIP_MULLINS_985A, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_985B, PCI_CHIP_MULLINS_985B, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_985C, PCI_CHIP_MULLINS_985C, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_985D, PCI_CHIP_MULLINS_985D, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_985E, PCI_CHIP_MULLINS_985E, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_985F, PCI_CHIP_MULLINS_985F, RES_SHARED_VGA },
{ PCI_CHIP_KAVERI_1304, PCI_CHIP_KAVERI_1304, RES_SHARED_VGA },
{ PCI_CHIP_KAVERI_1305, PCI_CHIP_KAVERI_1305, RES_SHARED_VGA },
{ PCI_CHIP_KAVERI_1306, PCI_CHIP_KAVERI_1306, RES_SHARED_VGA },
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index d4b3763..a73d9c1 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -642,6 +642,22 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_KABINI_983D, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_KABINI_983E, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_KABINI_983F, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9850, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9851, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9852, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9853, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9854, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9855, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9856, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9857, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9858, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9859, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_985A, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_985B, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_985C, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_985D, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_985E, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_985F, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1304, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1305, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1306, 0 ),
commit 5c86a3461597647224c33d5190b4531aeeb2655f
Author: Samuel Li <samuel.li at amd.com>
Date: Thu Apr 17 15:17:28 2014 -0400
radeon: add support for Mullins.
Signed-off-by: Samuel Li <samuel.li at amd.com>
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
diff --git a/man/radeon.man b/man/radeon.man
index f6a825d..65b880c 100644
--- a/man/radeon.man
+++ b/man/radeon.man
@@ -208,6 +208,9 @@ KABINI APUs
.TP 12
.B HAWAII
Radeon R9 series
+.TP 12
+.B MULLINS
+MULLINS APUs
.PD
.SH CONFIGURATION DETAILS
Please refer to __xconfigfile__(__filemansuffix__) for general configuration
diff --git a/src/radeon_probe.h b/src/radeon_probe.h
index 9500189..3fe4644 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -116,6 +116,7 @@ typedef enum {
CHIP_FAMILY_KAVERI,
CHIP_FAMILY_KABINI,
CHIP_FAMILY_HAWAII,
+ CHIP_FAMILY_MULLINS,
CHIP_FAMILY_LAST
} RADEONChipFamily;
commit fdb90ffc50acbb7d5ba0598470f9feeac6ce55fc
Author: Alex Deucher <alexander.deucher at amd.com>
Date: Fri May 2 17:45:45 2014 -0400
radeon: require libdrm_radeon 2.4.54 for mullins support
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
diff --git a/configure.ac b/configure.ac
index 9086bb6..dc2a656 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for libraries.
-PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.51])
+PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.54])
PKG_CHECK_MODULES(LIBDRM_RADEON, [libdrm_radeon])
# Obtain compiler/linker options for the driver dependencies
More information about the xorg-commit
mailing list