diff mbox series

[SRU,H/raspi,5/7] UBUNTU: SAUCE: Revert "vc4/drv: Only notify firmware of display done with kms"

Message ID 20211004181653.8298-6-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 e730e0de9b7ad1510676076c13dddaaa006d986a.

Prerequisite for the next commit.

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

Patch

diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
index 1aa69329276b..c9f585135782 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -246,18 +246,6 @@  const struct of_device_id vc4_dma_range_matches[] = {
 	{}
 };
 
-/*
- * 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 +306,7 @@  static int vc4_drm_bind(struct device *dev)
 
 	drm_fb_helper_remove_conflicting_framebuffers(NULL, "vc4drmfb", false);
 
-	if (vc4->firmware && !firmware_kms()) {
+	if (vc4->firmware) {
 		ret = rpi_firmware_property(vc4->firmware,
 					    RPI_FIRMWARE_NOTIFY_DISPLAY_DONE,
 					    NULL, 0);