From d6f2416b0a88bdaff258a5a6287e56398386f62a Mon Sep 17 00:00:00 2001 From: Yang Yingliang Date: Wed, 12 Jun 2019 10:45:17 +0800 Subject: [PATCH] config: enable CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT by default hulk inclusion category: bugfix bugzilla: 4979 CVE: NA ------------------------------------------------- Introduced by b30a43ac7132 ("drm/nouveau: add kconfig option to turn off nouveau legacy contexts. (v3)") Enable CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT by default Signed-off-by: Yang Yingliang --- arch/arm64/configs/hulk_defconfig | 1 + arch/arm64/configs/syzkaller_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig index c7025f08e6b7..4121fbb78f8d 100644 --- a/arch/arm64/configs/hulk_defconfig +++ b/arch/arm64/configs/hulk_defconfig @@ -3610,6 +3610,7 @@ CONFIG_DRM_RADEON_USERPTR=y # AMD Library routines # CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 # CONFIG_NOUVEAU_DEBUG_MMU is not set diff --git a/arch/arm64/configs/syzkaller_defconfig b/arch/arm64/configs/syzkaller_defconfig index c936677406c5..315cc7e99790 100644 --- a/arch/arm64/configs/syzkaller_defconfig +++ b/arch/arm64/configs/syzkaller_defconfig @@ -3587,6 +3587,7 @@ CONFIG_DRM_RADEON_USERPTR=y # AMD Library routines # CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 # CONFIG_NOUVEAU_DEBUG_MMU is not set -- GitLab