From 06498cbfe53330d3087e90a07b4fc7290c816ec5 Mon Sep 17 00:00:00 2001 From: François Cami Date: Feb 16 2018 14:19:03 +0000 Subject: enable CONFIG_DRM_AMDGPU_SI so that Southern Island devices work with amdgpu & radv --- diff --git a/configs/fedora/generic/CONFIG_DRM_AMDGPU_SI b/configs/fedora/generic/CONFIG_DRM_AMDGPU_SI index 78dd0a3..db6f0ae 100644 --- a/configs/fedora/generic/CONFIG_DRM_AMDGPU_SI +++ b/configs/fedora/generic/CONFIG_DRM_AMDGPU_SI @@ -1 +1 @@ -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index a3ac077..a6ffc59 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1283,7 +1283,7 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y CONFIG_DRM_ANALOGIX_ANX78XX=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index f3a8940..f7dd697 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1273,7 +1273,7 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y CONFIG_DRM_ANALOGIX_ANX78XX=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 3f7d044..31b5f3a 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1339,7 +1339,7 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y CONFIG_DRM_ANALOGIX_ANX78XX=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 8d2451e..815a6e6 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1284,7 +1284,7 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y CONFIG_DRM_ANALOGIX_ANX78XX=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index c02b5e2..c098694 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1274,7 +1274,7 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y CONFIG_DRM_ANALOGIX_ANX78XX=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 5cdc454..74755df 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1329,7 +1329,7 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y CONFIG_DRM_ANALOGIX_ANX78XX=m diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 800dd06..f229490 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -1124,7 +1124,7 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y CONFIG_DRM_ANALOGIX_ANX78XX=m diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 610b87e..178a17e 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -1135,7 +1135,7 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y CONFIG_DRM_ANALOGIX_ANX78XX=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index d26600c..8d95bff 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -1135,7 +1135,7 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y CONFIG_DRM_ANALOGIX_ANX78XX=m diff --git a/kernel-i686.config b/kernel-i686.config index 52b6c48..bd88ced 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -1124,7 +1124,7 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y CONFIG_DRM_ANALOGIX_ANX78XX=m diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index eb76a44..82d89af 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -1099,7 +1099,7 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y CONFIG_DRM_ANALOGIX_ANX78XX=m diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 8ebd3e2..65be666 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -1088,7 +1088,7 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y CONFIG_DRM_ANALOGIX_ANX78XX=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 47d6228..6beb468 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -1054,7 +1054,7 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y CONFIG_DRM_ANALOGIX_ANX78XX=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 6b1c83f..2ce40e3 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -1043,7 +1043,7 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y CONFIG_DRM_ANALOGIX_ANX78XX=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 6837405..498a8ba 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1054,7 +1054,7 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y CONFIG_DRM_ANALOGIX_ANX78XX=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 859aece..3729822 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1043,7 +1043,7 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y CONFIG_DRM_ANALOGIX_ANX78XX=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 35317db..738e9f1 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -1182,7 +1182,7 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y CONFIG_DRM_ANALOGIX_ANX78XX=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index bf1c130..0b69252 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -1171,7 +1171,7 @@ CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y CONFIG_DRM_ANALOGIX_ANX78XX=m diff --git a/kernel.spec b/kernel.spec index a4af0f0..cad448c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1866,6 +1866,9 @@ fi # # %changelog +* Thu Feb 15 2018 François Cami +- Enable CONFIG_DRM_AMDGPU_SI + * Thu Feb 15 2018 Jeremy Cline - 4.16.0-0.rc1.git3.1 - Linux v4.16-rc1-88-ge525de3ab046