aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2015-10-16 03:07:28 +0100
committerBen Hutchings <ben@decadent.org.uk>2015-10-19 21:16:33 +0100
commita73815e36d42c43a32602e228047d9a18566f110 (patch)
treea7a0c2a47fc15feb6fcacea1c6acd9fc63e08365
parent6dd6bf4bb237f11cc6a28812d6a37238611656e0 (diff)
downloadkernel_replicant_linux-a73815e36d42c43a32602e228047d9a18566f110.tar.gz
kernel_replicant_linux-a73815e36d42c43a32602e228047d9a18566f110.tar.bz2
kernel_replicant_linux-a73815e36d42c43a32602e228047d9a18566f110.zip
[x86] drm: Enable DRM_AMDGPU as module
-rw-r--r--debian/changelog4
-rw-r--r--debian/config/kernelarch-x86/config7
2 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c2b93ec73a6d..4ddbc3ce752a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
linux (4.2.3-3) UNRELEASED; urgency=medium
+ [ Salvatore Bonaccorso ]
* KEYS: Fix race between key destruction and finding a keyring by name
* KEYS: Fix crash when attempt to garbage collect an uninstantiated keyring
* KEYS: Don't permit request_key() to construct a new keyring
+ [ Ben Hutchings ]
+ * [x86] drm: Enable DRM_AMDGPU as module
+
-- Salvatore Bonaccorso <carnil@debian.org> Mon, 19 Oct 2015 21:23:18 +0200
linux (4.2.3-2) unstable; urgency=medium
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 58c9be31f98e..6e6febbd2dc5 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -471,11 +471,18 @@ CONFIG_DRM=m
CONFIG_DRM_TDFX=m
CONFIG_DRM_R128=m
CONFIG_DRM_RADEON=m
+CONFIG_DRM_AMDGPU=m
# CONFIG_DRM_I810 is not set
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
##
+## file: drivers/gpu/drm/amd/amdgpu/Kconfig
+##
+# CONFIG_DRM_AMDGPU_CIK is not set
+CONFIG_DRM_AMDGPU_USERPTR=y
+
+##
## file: drivers/gpu/drm/ast/Kconfig
##
CONFIG_DRM_AST=m