diff mbox series

[SRU,H/raspi,7/7] UBUNTU: SAUCE: Revert "drm/vc4: hdmi: Warn if we access the controller while disabled"

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

This commit causes lots of warnings during boot which in turn could cause
other problems. Prevent that by reverting the commit until we figure out
the root cause of the warnings.

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

Patch

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
index 99dde6e06a37..19d2fdc446bc 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
+++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
@@ -1,8 +1,6 @@ 
 #ifndef _VC4_HDMI_REGS_H_
 #define _VC4_HDMI_REGS_H_
 
-#include <linux/pm_runtime.h>
-
 #include "vc4_hdmi.h"
 
 #define VC4_HDMI_PACKET_STRIDE			0x24
@@ -414,8 +412,6 @@  static inline u32 vc4_hdmi_read(struct vc4_hdmi *hdmi,
 	const struct vc4_hdmi_variant *variant = hdmi->variant;
 	void __iomem *base;
 
-	WARN_ON(!pm_runtime_active(&hdmi->pdev->dev));
-
 	if (reg >= variant->num_registers) {
 		dev_warn(&hdmi->pdev->dev,
 			 "Invalid register ID %u\n", reg);
@@ -442,8 +438,6 @@  static inline void vc4_hdmi_write(struct vc4_hdmi *hdmi,
 	const struct vc4_hdmi_variant *variant = hdmi->variant;
 	void __iomem *base;
 
-	WARN_ON(!pm_runtime_active(&hdmi->pdev->dev));
-
 	if (reg >= variant->num_registers) {
 		dev_warn(&hdmi->pdev->dev,
 			 "Invalid register ID %u\n", reg);