From 430a56dd16fe583a812b2df44dca002acab2f4f6 Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Wed, 9 Aug 2023 10:40:27 +0200
Subject: [PATCH] raspberry-pi/4: fix modesetting on 6.1 kernels

---
 raspberry-pi/4/modesetting.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/raspberry-pi/4/modesetting.nix b/raspberry-pi/4/modesetting.nix
index b74e686ff..3e4a53931 100644
--- a/raspberry-pi/4/modesetting.nix
+++ b/raspberry-pi/4/modesetting.nix
@@ -27,6 +27,13 @@ in
   };
 
   config = lib.mkIf cfg.enable {
+    # fixes a crash: https://github.com/raspberrypi/linux/issues/5568
+    # can be removed for >= nixos 23.11: https://github.com/NixOS/nixpkgs/pull/247826
+    boot.kernelParams = [ "kunit.enable=0" ];
+
+    # doesn't work for the CM module, so we exclude e.g. bcm2711-rpi-cm4.dts
+    hardware.deviceTree.filter = "bcm2711-rpi-4*.dtb";
+
     # Configure for modesetting in the device tree
     hardware.deviceTree = {
       overlays = [