[PATCH][xenial/master-next] UBUNTU: [Config] CONFIG_DRM_AMDGPU_CIK=n

[Seth Forshee]

CIK support in amdgpu is currently experimental, and the upstream
maintainers do not recommend enabling it. Disabling CIK support
in amdgpu will result in falling back to the radeon driver, which
also supports this hardware.

BugLink: http://bugs.launchpad.net/bugs/1510405
Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
---
 debian.master/config/annotations          | 2 +-
 debian.master/config/config.common.ubuntu | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index ac279cf..e460188 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -1324,7 +1324,7 @@ CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT          note<LP:1473319>
 
 # Menu: Device Drivers >> Graphics support >> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) >> AMD GPU
 CONFIG_DRM_AMDGPU                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
-CONFIG_DRM_AMDGPU_CIK                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}>
+CONFIG_DRM_AMDGPU_CIK                           policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}>
 CONFIG_DRM_AMDGPU_USERPTR                       policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}>
 CONFIG_HSA_AMD                                  policy<{'amd64': 'm'}>
 
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 3f22c4c..777f4a8 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1895,7 +1895,7 @@ CONFIG_DRA752_THERMAL=y
 CONFIG_DRAGONRISE_FF=y
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_DRM_AMDGPU=m
-CONFIG_DRM_AMDGPU_CIK=y
+# CONFIG_DRM_AMDGPU_CIK is not set
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_ARMADA=m
 CONFIG_DRM_AST=m
-- 
1.9.1