From 8299d1f057439f94c6a4412e2e5c5082b82a30c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Sat, 21 Aug 2021 10:54:34 +0200 Subject: bcm27xx: add kernel 5.10 support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rebased RPi foundation patches on linux 5.10.59, removed applied and reverted patches, wireless patches and defconfig patches. bcm2708: boot tested on RPi B+ v1.2 bcm2709: boot tested on RPi 4B v1.1 4G bcm2711: boot tested on RPi 4B v1.1 4G Signed-off-by: Álvaro Fernández Rojas --- ...y-notify-firmware-of-display-done-with-km.patch | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 target/linux/bcm27xx/patches-5.10/950-0673-vc4-drv-Only-notify-firmware-of-display-done-with-km.patch (limited to 'target/linux/bcm27xx/patches-5.10/950-0673-vc4-drv-Only-notify-firmware-of-display-done-with-km.patch') diff --git a/target/linux/bcm27xx/patches-5.10/950-0673-vc4-drv-Only-notify-firmware-of-display-done-with-km.patch b/target/linux/bcm27xx/patches-5.10/950-0673-vc4-drv-Only-notify-firmware-of-display-done-with-km.patch new file mode 100644 index 0000000000..a15245626f --- /dev/null +++ b/target/linux/bcm27xx/patches-5.10/950-0673-vc4-drv-Only-notify-firmware-of-display-done-with-km.patch @@ -0,0 +1,43 @@ +From b14001459c04ec0d4a99c1a422077fbce5a0aebc Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Mon, 5 Jul 2021 11:43:12 +0100 +Subject: [PATCH] vc4/drv: Only notify firmware of display done with + kms + +fkms driver still wants firmware display to be active + +Signed-off-by: Dom Cobley +--- + drivers/gpu/drm/vc4/vc4_drv.c | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/vc4/vc4_drv.c ++++ b/drivers/gpu/drm/vc4/vc4_drv.c +@@ -258,6 +258,18 @@ const struct of_device_id vc4_dma_range_ + {} + }; + ++/* ++ * we need this helper function for determining presence of fkms ++ * before it's been bound ++ */ ++static bool firmware_kms(void) ++{ ++ return of_device_is_available(of_find_compatible_node(NULL, NULL, ++ "raspberrypi,rpi-firmware-kms")) || ++ of_device_is_available(of_find_compatible_node(NULL, NULL, ++ "raspberrypi,rpi-firmware-kms-2711")); ++} ++ + static int vc4_drm_bind(struct device *dev) + { + struct platform_device *pdev = to_platform_device(dev); +@@ -318,7 +330,7 @@ static int vc4_drm_bind(struct device *d + + drm_fb_helper_remove_conflicting_framebuffers(NULL, "vc4drmfb", false); + +- if (vc4->firmware) { ++ if (vc4->firmware && !firmware_kms()) { + ret = rpi_firmware_property(vc4->firmware, + RPI_FIRMWARE_NOTIFY_DISPLAY_DONE, + NULL, 0); -- cgit v1.2.3