mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 14:37:57 +00:00
ca5c695a45
Deleted following upstreamed patches: bcm27xx: 950-0006-drm-vc4-hdmi-Fix-HPD-GPIO-detection.patch bcm27xx: 950-0420-drm-vc4-Adopt-the-dma-configuration-from-the-HVS-or-.patch bcm27xx: 950-0425-drm-vc4-A-present-but-empty-dmas-disables-audio.patch bcm27xx: 950-0432-vc4-drm-Avoid-full-hdmi-audio-fifo-writes.patch bcm27xx: 950-0433-vc4-drm-vc4_plane-Remove-subpixel-positioning-check.patch bcm27xx: 950-0435-drm-vc4-Correct-pixel-order-for-DSI0.patch bcm27xx: 950-0436-drm-vc4-Register-dsi0-as-the-correct-vc4-encoder-typ.patch bcm27xx: 950-0437-drm-vc4-Fix-dsi0-interrupt-support.patch bcm27xx: 950-0438-drm-vc4-Add-correct-stop-condition-to-vc4_dsi_encode.patch bcm27xx: 950-0443-drm-vc4-Fix-timings-for-interlaced-modes.patch bcm27xx: 950-0445-drm-vc4-Fix-margin-calculations-for-the-right-bottom.patch bcm27xx: 950-0475-drm-vc4-Reset-HDMI-MISC_CONTROL-register.patch bcm27xx: 950-0476-drm-vc4-Release-workaround-buffer-and-DMA-in-error-p.patch bcm27xx: 950-0477-drm-vc4-Correct-DSI-divider-calculations.patch bcm27xx: 950-0664-drm-vc4-dsi-Correct-max-divider-to-255-not-7.patch bcm53xx: 072-next-ARM_dts_BCM53015-add-mr26.patch mediatek: 920-linux-next-dts-mt7622-bpi-r64-fix-wps-button.patch Manually rebased following patches: bcm27xx: 950-0004-drm-vc4-hdmi-Remove-the-DDC-probing-for-status-detec.patch bcm27xx: 950-0700-net-phy-lan87xx-Decrease-phy-polling-rate.patch bcm27xx: 950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch bcm27xx: 950-0713-drm-vc4-Remove-splitting-the-bridge-chain-from-the-d.patch bcm27xx: 950-0715-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch bcm27xx: 950-0787-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch bcm27xx: 950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch Runtime tested on turris-omnia and glinet-b1300. Tested-by: John Audia <therealgraysky@proton.me> [bcm2711/RPi4B, mt7622/RT3200] Signed-off-by: Petr Štetiar <ynezz@true.cz>
70 lines
2.0 KiB
Diff
70 lines
2.0 KiB
Diff
From 9e9177db83609c19bbe523cc4d20119cf09ea787 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Wed, 15 Dec 2021 10:51:17 +0100
|
|
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>
|
|
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20211215095117.176435-5-maxime@cerno.tech
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_drv.c | 22 ++++++++++++++++++++++
|
|
1 file changed, 22 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
|
|
@@ -37,6 +37,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"
|
|
@@ -226,6 +228,7 @@ static const struct of_device_id vc4_dma
|
|
static int vc4_drm_bind(struct device *dev)
|
|
{
|
|
struct platform_device *pdev = to_platform_device(dev);
|
|
+ struct rpi_firmware *firmware = NULL;
|
|
struct drm_device *drm;
|
|
struct vc4_dev *vc4;
|
|
struct device_node *node;
|
|
@@ -272,10 +275,29 @@ static int vc4_drm_bind(struct device *d
|
|
if (ret)
|
|
return ret;
|
|
|
|
+ node = of_find_compatible_node(NULL, NULL, "raspberrypi,bcm2835-firmware");
|
|
+ if (node) {
|
|
+ firmware = rpi_firmware_get(node);
|
|
+ of_node_put(node);
|
|
+
|
|
+ if (!firmware)
|
|
+ return -EPROBE_DEFER;
|
|
+ }
|
|
+
|
|
ret = drm_aperture_remove_framebuffers(false, &vc4_drm_driver);
|
|
if (ret)
|
|
return ret;
|
|
|
|
+ if (firmware) {
|
|
+ ret = rpi_firmware_property(firmware,
|
|
+ RPI_FIRMWARE_NOTIFY_DISPLAY_DONE,
|
|
+ NULL, 0);
|
|
+ if (ret)
|
|
+ drm_warn(drm, "Couldn't stop firmware display driver: %d\n", ret);
|
|
+
|
|
+ rpi_firmware_put(firmware);
|
|
+ }
|
|
+
|
|
ret = component_bind_all(dev, drm);
|
|
if (ret)
|
|
return ret;
|