summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/common-config.nix
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-05-10 12:01:10 +0000
committerGitHub <noreply@github.com>2023-05-10 12:01:10 +0000
commit71874015ba0be64d8d640b8ceeb642cac83c5b71 (patch)
tree4a640d7cac53d506cd0dcece6108eb0d386aa16f /pkgs/os-specific/linux/kernel/common-config.nix
parent9e15b1f32b765bce5f240135b417767adf87257e (diff)
parent9b5bd90d79ac3ed80e766a6abd953ce208c3184d (diff)
downloadnixpkgs-71874015ba0be64d8d640b8ceeb642cac83c5b71.tar
nixpkgs-71874015ba0be64d8d640b8ceeb642cac83c5b71.tar.gz
nixpkgs-71874015ba0be64d8d640b8ceeb642cac83c5b71.tar.bz2
nixpkgs-71874015ba0be64d8d640b8ceeb642cac83c5b71.tar.lz
nixpkgs-71874015ba0be64d8d640b8ceeb642cac83c5b71.tar.xz
nixpkgs-71874015ba0be64d8d640b8ceeb642cac83c5b71.tar.zst
nixpkgs-71874015ba0be64d8d640b8ceeb642cac83c5b71.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 2083fe3e607..4a122922115 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -314,8 +314,8 @@ let
       DRM_AMD_DC_DCN2_0 = whenBetween "5.3" "5.6" yes;
       DRM_AMD_DC_DCN2_1 = whenBetween "5.4" "5.6" yes;
       DRM_AMD_DC_DCN3_0 = whenBetween "5.9" "5.11" yes;
-      DRM_AMD_DC_DCN = whenAtLeast "5.11" yes;
-      DRM_AMD_DC_HDCP = whenAtLeast "5.5" yes;
+      DRM_AMD_DC_DCN = whenBetween "5.11" "6.4" yes;
+      DRM_AMD_DC_HDCP = whenBetween "5.5" "6.4" yes;
       DRM_AMD_DC_SI = whenAtLeast "5.10" yes;
     } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {
       # Intel GVT-g graphics virtualization supports 64-bit only