raspberry-pi/4: fix modesetting on 6.1 kernels #693
Conversation
yu-re-ka
force-pushed
the
rpi4-modesetting
branch
from
c191e93
to
62919b8
Compare
| # 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 |
There was a problem hiding this comment.
The glob below doesn't match this filename, and might exclude other modules, so the comment is a bit misleading.
There was a problem hiding this comment.
what do you mean? it excludes the said device tree, so that is exactly the point
There was a problem hiding this comment.
The comment says we will exclude bcm2711-rpi-cm4.dts.
The glob says we will exclude bcm2711-rpi-4*.dtb.
The glob bcm2711-rpi-4*.dtb does not match the filename bcm2711-rpi-cm4.dts, so the comment is confusing at best.
There was a problem hiding this comment.
Oh hang on, I was assuming the .filter removes the specified files — does it instead specify which to include?
There was a problem hiding this comment.
Yes, it is an include
|
Might an admin (@Mic92?) be willing to merge this please? |
|
Thanks @Mic92! |
|
@yu-re-ka @Mic92 @samueldr Does anyone actually understand WHY we fail to apply to cm4? I'm totally on board with merging this as a short term fix because normal 4b users shouldn't encounter errors when trying to use these settings, but I wonder whether this is breaking things for cm4 users. Why is compatible = "brcm,bcm2711"; not enough to make this apply appropriately, basically? |
Description of changes
Fixes #631
This should work with both nixos-23.05 and nixos-unstable
Things done
nixos-hardwareandimporting it via
<nixos-hardware>or Flake input