mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
8299d1f057
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 <noltari@gmail.com>
55 lines
1.5 KiB
Diff
55 lines
1.5 KiB
Diff
From 154a12e5c0d417cae205b8e16431f29c627311e6 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Wed, 23 Jun 2021 11:54:58 +0200
|
|
Subject: [PATCH] drm/vc4: Notify the firmware when DRM is in charge
|
|
|
|
Once the call to drm_fb_helper_remove_conflicting_framebuffers() has
|
|
been made, simplefb has been unregistered and the KMS driver is entirely
|
|
in charge of the display.
|
|
|
|
Thus, we can notify the firmware it can free whatever resource it was
|
|
using to maintain simplefb functional.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_drv.c | 19 +++++++++++++++++++
|
|
1 file changed, 19 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
|
|
@@ -36,6 +36,8 @@
|
|
#include <drm/drm_fb_helper.h>
|
|
#include <drm/drm_vblank.h>
|
|
|
|
+#include <soc/bcm2835/raspberrypi-firmware.h>
|
|
+
|
|
#include "uapi/drm/vc4_drm.h"
|
|
|
|
#include "vc4_drv.h"
|
|
@@ -305,8 +307,25 @@ static int vc4_drm_bind(struct device *d
|
|
if (ret)
|
|
return ret;
|
|
|
|
+ node = of_parse_phandle(dev->of_node, "raspberrypi,firmware", 0);
|
|
+ if (node) {
|
|
+ vc4->firmware = rpi_firmware_get(dev->of_node);
|
|
+ of_node_put(node);
|
|
+
|
|
+ if (!vc4->firmware)
|
|
+ return -EPROBE_DEFER;
|
|
+ }
|
|
+
|
|
drm_fb_helper_remove_conflicting_framebuffers(NULL, "vc4drmfb", false);
|
|
|
|
+ if (vc4->firmware) {
|
|
+ ret = rpi_firmware_property(vc4->firmware,
|
|
+ RPI_FIRMWARE_NOTIFY_DISPLAY_DONE,
|
|
+ NULL, 0);
|
|
+ if (ret)
|
|
+ drm_warn(drm, "Couldn't stop firmware display driver: %d\n", ret);
|
|
+ }
|
|
+
|
|
ret = component_bind_all(dev, drm);
|
|
if (ret)
|
|
return ret;
|