summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2016-03-21 19:59:11 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2016-03-21 19:59:11 -0400
commit5093f682b9e4d983d277aaa0824cd0b01ec826c9 (patch)
tree1c69430e799302d724302afe2100b46fa5dbcfc2 /config-generic
parent32ae36ddcefb8b70d0a8b9dceea3bdc853f6928e (diff)
downloadkernel-5093f682b9e4d983d277aaa0824cd0b01ec826c9.tar.gz
kernel-5093f682b9e4d983d277aaa0824cd0b01ec826c9.tar.xz
kernel-5093f682b9e4d983d277aaa0824cd0b01ec826c9.zip
Linux v4.5-10883-g770c4c1119db
- drm, arm64-perf, arc, udf, quota merges
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic3
1 files changed, 3 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index 3dea9996e..85d0d9733 100644
--- a/config-generic
+++ b/config-generic
@@ -3338,6 +3338,7 @@ CONFIG_VGA_ARB_MAX_GPUS=16
CONFIG_DRM=m
+CONFIG_DRM_DP_AUX_CHARDEV=y
CONFIG_DRM_FBDEV_EMULATION=y
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_AST=m # do not enable on f17 or older
@@ -3348,6 +3349,7 @@ CONFIG_DRM_RADEON=m
CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RADEON_UMS is not set
CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_AMD_ACP=y
# CONFIG_DRM_AMDGPU_CIK is not set
CONFIG_DRM_AMDGPU_USERPTR=y
CONFIG_DRM_AMD_POWERPLAY=y
@@ -3360,6 +3362,7 @@ CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
CONFIG_DRM_I915_FBDEV=y
# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
+CONFIG_DRM_I915_USERPTR=y
CONFIG_DRM_VIA=m
CONFIG_DRM_NOUVEAU=m
CONFIG_NOUVEAU_DEBUG=5