diff mbox series

[SRU,H/raspi,6/7] UBUNTU: SAUCE: Revert "drm/vc4: Notify the firmware when DRM is in charge"

Message ID 20211004181653.8298-7-juergh@canonical.com
State New
Headers show
Series HDMI does not display anything with Impish RPi desktop image (LP: #1944397) | expand

Commit Message

Juerg Haefliger Oct. 4, 2021, 6:16 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1944397

This reverts commit 5e4c6b0cbd95bfac2c0ffec2bf2ebefe8b143631.

With current Hirsute firmware, this commit causes:
[  0.124340] raspberrypi-firmware soc:firmware: Attached to firmware from 2021-02-25T12:10:40, variant start
[  0.128359] raspberrypi-firmware soc:firmware: Firmware hash is 564e5f9b852b23a330b1764bcf0b2d022a20afd0
[ 17.517350] raspberrypi-firmware soc:firmware: Request 0x00030066 returned status 0x80000001
[ 17.530301] vc4-drm gpu: [drm] Couldn't stop firmware display driver: -22

So revert it.

Signed-off-by: Juerg Haefliger <juergh@canonical.com>
---
 drivers/gpu/drm/vc4/vc4_drv.c | 19 -------------------
 1 file changed, 19 deletions(-)
diff mbox series

Patch

diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
index c9f585135782..a211ae182316 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -36,8 +36,6 @@ 
 #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"
@@ -295,25 +293,8 @@  static int vc4_drm_bind(struct device *dev)
 	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;