From 2b28822d8dec38fd62ef17643ec71da3bb488619 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Fri, 19 Feb 2021 05:19:19 +0000 Subject: [PATCH] common-config: fixup compilation for linux 5.11 DRM_AMD_DC_DCN3_0 has been renamed DRM_AMD_DC_DCN in linux 5.11 see: https://github.com/torvalds/linux/commit/20f2ffe504728612d7b0c34e4f8280e34251e704 https://github.com/NixOS/nixpkgs/pull/113194#issuecomment-781766471 Signed-off-by: Arthur Gautier --- pkgs/os-specific/linux/kernel/common-config.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c71fdc327358..6aff72111a3f 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -251,7 +251,8 @@ let # (stable) amdgpu support for bonaire and newer chipsets DRM_AMDGPU_CIK = whenAtLeast "4.9" yes; # amdgpu support for RX6000 series - DRM_AMD_DC_DCN3_0 = whenAtLeast "5.9.12" yes; + DRM_AMD_DC_DCN3_0 = whenBetween "5.9.12" "5.11" yes; + DRM_AMD_DC_DCN = whenAtLeast "5.11" yes; # Allow device firmware updates DRM_DP_AUX_CHARDEV = whenAtLeast "4.6" yes; } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {