summary refs log tree commit diff
diff options
context:
space:
mode:
authorBernardo Meurer <bernardo@meurer.org>2021-08-02 17:38:39 -0700
committerBernardo Meurer <bernardo@meurer.org>2021-08-05 09:59:08 -0700
commitbcbdce8947e98ef4ff0b9af854cc8e2b90775043 (patch)
tree9de7e12ce74ead91f6911762c49b1fb484dcf4e9
parent8a4a84ec587f5bdb1856c5c522fec81a8f2c06d1 (diff)
downloadnixpkgs-bcbdce8947e98ef4ff0b9af854cc8e2b90775043.tar
nixpkgs-bcbdce8947e98ef4ff0b9af854cc8e2b90775043.tar.gz
nixpkgs-bcbdce8947e98ef4ff0b9af854cc8e2b90775043.tar.bz2
nixpkgs-bcbdce8947e98ef4ff0b9af854cc8e2b90775043.tar.lz
nixpkgs-bcbdce8947e98ef4ff0b9af854cc8e2b90775043.tar.xz
nixpkgs-bcbdce8947e98ef4ff0b9af854cc8e2b90775043.tar.zst
nixpkgs-bcbdce8947e98ef4ff0b9af854cc8e2b90775043.zip
linux_rpi{0,1,2,3,4}: 5.10.17 -> 5.10.52
-rw-r--r--pkgs/os-specific/linux/kernel/linux-rpi.nix13
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index 8ccf46b402b..6a4f98c32d7 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -2,8 +2,8 @@
 
 let
   # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
-  modDirVersion = "5.10.17";
-  tag = "1.20210303";
+  modDirVersion = "5.10.52";
+  tag = "1.20210727";
 in
 lib.overrideDerivation (buildLinux (args // {
   version = "${modDirVersion}-${tag}";
@@ -12,8 +12,8 @@ lib.overrideDerivation (buildLinux (args // {
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "linux";
-    rev = "raspberrypi-kernel_${tag}-1";
-    sha256 = "0ffsllayl18ka4mgp4rdy9h0da5gy1n6g0kfvinvzdzabb5wzvrx";
+    rev = tag;
+    sha256 = "0nabl547y75n1yx4584gidlhfv3ajzgbxcrkfa5sb04jwj0d469k";
   };
 
   defconfig = {
@@ -33,6 +33,11 @@ lib.overrideDerivation (buildLinux (args // {
     #       |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
     # ../drivers/gpu/drm/ast/ast_mode.c:851:18: note: (near initialization for 'ast_crtc_helper_funcs.atomic_flush')
     DRM_AST n
+    # ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_atomic_commit_tail':
+    # ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:7757:4: error: implicit declaration of function 'is_hdr_metadata_different' [-Werror=implicit-function-declaration]
+    #  7757 |    is_hdr_metadata_different(old_con_state, new_con_state);
+    #       |    ^~~~~~~~~~~~~~~~~~~~~~~~~
+    DRM_AMDGPU n
   '';
 
   extraMeta = if (rpiVersion < 3) then {