From e81177b8a9494906fd0b47f08aa8fc413b80ef19 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 16 Nov 2017 18:44:33 +0000 Subject: [PATCH] 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 8dc21a567..2ed2ddb7c 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 Sat, 04 Nov 2017 09:54:41 +0100 diff --git a/debian/config/config b/debian/config/config index 07e33bbda..46907165e 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 180d583c2..a31559883 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -502,12 +502,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 ##