Merge branch 'master' into 'master'

[x86] Enable DCN 1.0 Raven family (Closes #901349)

See merge request kernel-team/linux!35
This commit is contained in:
Ben Hutchings 2018-06-22 20:42:05 +00:00
commit 6e4eb4c604
2 changed files with 9 additions and 0 deletions

4
debian/changelog vendored
View File

@ -1,5 +1,6 @@
linux (4.17.2-1~exp2) UNRELEASED; urgency=medium
[ Ben Hutchings ]
* [amd64,arm64,armhf] android: Build modules to support Anbox
(Closes: #901492)
- Enable building ashmem and binder as modules
@ -9,6 +10,9 @@ linux (4.17.2-1~exp2) UNRELEASED; urgency=medium
- Disable ANDROID_BINDER_IPC_32BIT
* [mips*] Increase RELOCATION_TABLE_SIZE to 0x00140000 (fixes FTBFS)
[ Romain Perier ]
* [x86] Enable DCN 1.0 Raven family (Closes #901349)
-- Ben Hutchings <ben@decadent.org.uk> Fri, 22 Jun 2018 17:34:37 +0100
linux (4.17.2-1~exp1) experimental; urgency=medium

View File

@ -511,6 +511,11 @@ CONFIG_DRM_AMD_ACP=y
##
CONFIG_HSA_AMD=m
##
## file: drivers/gpu/drm/amd/display/Kconfig
##
CONFIG_DRM_AMD_DC_DCN1_0=y
##
## file: drivers/gpu/drm/ast/Kconfig
##