[linux] 03/07: amdgpu: Enable DRM_AMDGPU_USERPTR on all architectures

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit e81177b8a9494906fd0b47f08aa8fc413b80ef19
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Nov 16 18:44:33 2017 +0000

    amdgpu: Enable DRM_AMDGPU_USERPTR on all architectures
    
    I missed this when enabling amdgpu on arm64.
    
    Also move the explicit disabling of DRM_AMDGPU_CIK to the top level
    config.
---
 debian/changelog                    | 1 +
 debian/config/config                | 2 ++
 debian/config/kernelarch-x86/config | 6 ------
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8dc21a5..2ed2ddb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -135,6 +135,7 @@ linux (4.13.13-1) UNRELEASED; urgency=medium
   * nftables: Enable NFT_RT, NFT_SET_BITMAP, NFT_OBJREF as modules
     (Closes: #881931)
   * [powerpc*/*64*] drm: Enable DRM_AMDGPU as module (Closes: #881593)
+  * amdgpu: Enable DRM_AMDGPU_USERPTR on all architectures
 
  -- Salvatore Bonaccorso <carnil at debian.org>  Sat, 04 Nov 2017 09:54:41 +0100
 
diff --git a/debian/config/config b/debian/config/config
index 07e33bb..4690716 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -616,6 +616,8 @@ CONFIG_DRM_SAVAGE=m
 ## file: drivers/gpu/drm/amd/amdgpu/Kconfig
 ##
 # CONFIG_DRM_AMDGPU_SI is not set
+# CONFIG_DRM_AMDGPU_CIK is not set
+CONFIG_DRM_AMDGPU_USERPTR=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 
 ##
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 180d583..a315598 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -503,12 +503,6 @@ CONFIG_DRM_SIS=m
 CONFIG_DRM_AMD_ACP=y
 
 ##
-## file: drivers/gpu/drm/amd/amdgpu/Kconfig
-##
-# CONFIG_DRM_AMDGPU_CIK is not set
-CONFIG_DRM_AMDGPU_USERPTR=y
-
-##
 ## file: drivers/gpu/drm/amd/amdkfd/Kconfig
 ##
 CONFIG_HSA_AMD=m

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git