Merge remote-tracking branch 'origin/f27' into f27-user-thl-vanilla-fedora

21 files changed, 25 insertions, 21 deletions

diff --git a/baseconfig/CONFIG_DRM_AMDGPU_SI b/baseconfig/CONFIG_DRM_AMDGPU_SI
index 78dd0a3c6..db6f0aeac 100644
--- a/baseconfig/CONFIG_DRM_AMDGPU_SI
+++ b/baseconfig/CONFIG_DRM_AMDGPU_SI
@@ -1 +1 @@
-# CONFIG_DRM_AMDGPU_SI is not set
+CONFIG_DRM_AMDGPU_SI=y
diff --git a/baseconfig/arm/aarch64/CONFIG_GPIO_MB86S7X b/baseconfig/arm/aarch64/CONFIG_GPIO_MB86S7X
new file mode 100644
index 000000000..3c4c7370f
--- /dev/null
+++ b/baseconfig/arm/aarch64/CONFIG_GPIO_MB86S7X
@@ -0,0 +1 @@
+CONFIG_GPIO_MB86S7X=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 0c9e5162f..f33f78763 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1266,7 +1266,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
@@ -1773,7 +1773,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MAX732X is not set
 CONFIG_GPIO_MAX77620=m
-# CONFIG_GPIO_MB86S7X is not set
+CONFIG_GPIO_MB86S7X=m
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_GPIO_MOCKUP is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index ecef63636..29aae4ef4 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1256,7 +1256,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
@@ -1756,7 +1756,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MAX732X is not set
 CONFIG_GPIO_MAX77620=m
-# CONFIG_GPIO_MB86S7X is not set
+CONFIG_GPIO_MB86S7X=m
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_GPIO_MOCKUP is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 45177f143..a86c609b4 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1328,7 +1328,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 898c50f6d..7a951727f 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.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-lpae.config b/kernel-armv7hl-lpae.config
index 14c6febb2..b1af61f64 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1263,7 +1263,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 d5d2274fb..388b3c2ef 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1318,7 +1318,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 a6b31379b..2d39d47da 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -1115,7 +1115,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 00845b2d4..b9fb69a2e 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -1126,7 +1126,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 f63d48312..aa82312d4 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1126,7 +1126,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 18e6cbfd9..6c8ceb94c 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1115,7 +1115,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 785cf39bb..62427935d 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -1091,7 +1091,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 6491f2b3f..f67ceca4f 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -1080,7 +1080,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 36300e89d..bc12af4ee 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1046,7 +1046,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 3cccb1972..0f9d2cf87 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1035,7 +1035,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 bc4874eea..988f6bab9 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1046,7 +1046,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 5a2769d20..a11a7e02b 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1035,7 +1035,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 2fd75cff8..ad7fd5939 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1172,7 +1172,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 1633f5c03..6192f83bc 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1161,7 +1161,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 217e70392..075c49530 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1951,6 +1951,9 @@ fi
 #
 #
 %changelog
+* Thu Feb 15 2018 François Cami <fcami@fedoraproject.org>
+- Enable CONFIG_DRM_AMDGPU_SI
+
 * Tue Feb 13 2018 Laura Abbott <labbott@redhat.com> - 4.15.3-300
 - Linux v4.15.3
 - Fix for b43 wifi (rhbz 1544821)