All of lore.kernel.org
 help / color / mirror / Atom feed
From: Maxime Ripard <maxime@cerno.tech>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
	Thomas Zimmermann <tzimmermann@suse.de>,
	Maxime Ripard <maxime@cerno.tech>,
	Daniel Vetter <daniel.vetter@intel.com>,
	David Airlie <airlied@linux.ie>
Cc: linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org,
	linux-rpi-kernel@lists.infradead.org,
	Mike Turquette <mturquette@baylibre.com>,
	Stephen Boyd <sboyd@kernel.org>,
	Nicolas Saenz Julienne <nsaenz@kernel.org>,
	Florian Fainelli <f.fainelli@gmail.com>,
	Michael Stapelberg <michael@stapelberg.ch>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Dave Stevenson <dave.stevenson@raspberrypi.com>
Subject: [PATCH 5/5] drm/vc4: hdmi: Make sure the controller is powered in detect
Date: Wed, 22 Sep 2021 14:54:19 +0200	[thread overview]
Message-ID: <20210922125419.4125779-6-maxime@cerno.tech> (raw)
In-Reply-To: <20210922125419.4125779-1-maxime@cerno.tech>

If the HPD GPIO is not available and drm_probe_ddc fails, we end up
reading the HDMI_HOTPLUG register, but the controller might be powered
off resulting in a CPU hang. Make sure we have the power domain and the
HSM clock powered during the detect cycle to prevent the hang from
happening.

Fixes: 4f6e3d66ac52 ("drm/vc4: Add runtime PM support to the HDMI encoder driver")
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
---
 drivers/gpu/drm/vc4/vc4_hdmi.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 630b84ab73a2..8e6d7e1af200 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -168,6 +168,8 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force)
 	struct vc4_hdmi *vc4_hdmi = connector_to_vc4_hdmi(connector);
 	bool connected = false;
 
+	WARN_ON(pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev));
+
 	if (vc4_hdmi->hpd_gpio &&
 	    gpiod_get_value_cansleep(vc4_hdmi->hpd_gpio)) {
 		connected = true;
@@ -188,10 +190,12 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force)
 			}
 		}
 
+		pm_runtime_put(&vc4_hdmi->pdev->dev);
 		return connector_status_connected;
 	}
 
 	cec_phys_addr_invalidate(vc4_hdmi->cec_adap);
+	pm_runtime_put(&vc4_hdmi->pdev->dev);
 	return connector_status_disconnected;
 }
 
-- 
2.31.1


WARNING: multiple messages have this Message-ID (diff)
From: Maxime Ripard <maxime@cerno.tech>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
	Thomas Zimmermann <tzimmermann@suse.de>,
	Maxime Ripard <maxime@cerno.tech>,
	Daniel Vetter <daniel.vetter@intel.com>,
	David Airlie <airlied@linux.ie>
Cc: linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org,
	linux-rpi-kernel@lists.infradead.org,
	Mike Turquette <mturquette@baylibre.com>,
	Stephen Boyd <sboyd@kernel.org>,
	Nicolas Saenz Julienne <nsaenz@kernel.org>,
	Florian Fainelli <f.fainelli@gmail.com>,
	Michael Stapelberg <michael@stapelberg.ch>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Dave Stevenson <dave.stevenson@raspberrypi.com>
Subject: [PATCH 5/5] drm/vc4: hdmi: Make sure the controller is powered in detect
Date: Wed, 22 Sep 2021 14:54:19 +0200	[thread overview]
Message-ID: <20210922125419.4125779-6-maxime@cerno.tech> (raw)
In-Reply-To: <20210922125419.4125779-1-maxime@cerno.tech>

If the HPD GPIO is not available and drm_probe_ddc fails, we end up
reading the HDMI_HOTPLUG register, but the controller might be powered
off resulting in a CPU hang. Make sure we have the power domain and the
HSM clock powered during the detect cycle to prevent the hang from
happening.

Fixes: 4f6e3d66ac52 ("drm/vc4: Add runtime PM support to the HDMI encoder driver")
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
---
 drivers/gpu/drm/vc4/vc4_hdmi.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 630b84ab73a2..8e6d7e1af200 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -168,6 +168,8 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force)
 	struct vc4_hdmi *vc4_hdmi = connector_to_vc4_hdmi(connector);
 	bool connected = false;
 
+	WARN_ON(pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev));
+
 	if (vc4_hdmi->hpd_gpio &&
 	    gpiod_get_value_cansleep(vc4_hdmi->hpd_gpio)) {
 		connected = true;
@@ -188,10 +190,12 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force)
 			}
 		}
 
+		pm_runtime_put(&vc4_hdmi->pdev->dev);
 		return connector_status_connected;
 	}
 
 	cec_phys_addr_invalidate(vc4_hdmi->cec_adap);
+	pm_runtime_put(&vc4_hdmi->pdev->dev);
 	return connector_status_disconnected;
 }
 
-- 
2.31.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2021-09-22 12:54 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-22 12:54 [PATCH 0/5] drm/vc4: hdmi: Remove CPU hangs, take 2 Maxime Ripard
2021-09-22 12:54 ` Maxime Ripard
2021-09-22 12:54 ` [PATCH 1/5] clk: bcm-2835: Pick the closest clock rate Maxime Ripard
2021-09-22 12:54   ` Maxime Ripard
2021-09-28 16:26   ` nicolas saenz julienne
2021-09-28 16:26     ` nicolas saenz julienne
2021-09-30 18:08   ` Stephen Boyd
2021-09-30 18:08     ` Stephen Boyd
2021-10-13 12:59   ` (subset) " Maxime Ripard
2021-10-13 12:59     ` Maxime Ripard
2021-09-22 12:54 ` [PATCH 2/5] clk: bcm-2835: Remove rounding up the dividers Maxime Ripard
2021-09-22 12:54   ` Maxime Ripard
2021-09-28 16:26   ` nicolas saenz julienne
2021-09-28 16:26     ` nicolas saenz julienne
2021-09-29 13:27     ` Maxime Ripard
2021-09-29 13:27       ` Maxime Ripard
2021-09-30 18:09   ` Stephen Boyd
2021-09-30 18:09     ` Stephen Boyd
2021-10-13 12:59   ` (subset) " Maxime Ripard
2021-10-13 12:59     ` Maxime Ripard
2021-09-22 12:54 ` [PATCH 3/5] drm/vc4: hdmi: Set a default HSM rate Maxime Ripard
2021-09-22 12:54   ` Maxime Ripard
2021-09-30 15:51   ` nicolas saenz julienne
2021-09-30 15:51     ` nicolas saenz julienne
2021-10-13 12:59   ` (subset) " Maxime Ripard
2021-10-13 12:59     ` Maxime Ripard
2021-09-22 12:54 ` [PATCH 4/5] drm/vc4: hdmi: Move the HSM clock enable to runtime_pm Maxime Ripard
2021-09-22 12:54   ` Maxime Ripard
2021-09-30 15:54   ` nicolas saenz julienne
2021-09-30 15:54     ` nicolas saenz julienne
2021-10-13 12:59   ` (subset) " Maxime Ripard
2021-10-13 12:59     ` Maxime Ripard
2021-09-22 12:54 ` Maxime Ripard [this message]
2021-09-22 12:54   ` [PATCH 5/5] drm/vc4: hdmi: Make sure the controller is powered in detect Maxime Ripard
2021-09-30 15:55   ` nicolas saenz julienne
2021-09-30 15:55     ` nicolas saenz julienne
2021-10-13 12:59   ` (subset) " Maxime Ripard
2021-10-13 12:59     ` Maxime Ripard
     [not found] ` <CANnVG6kFC7q_dDDp4rRZsJz=paHKy2STn9127LE=JJOf2kW2TA@mail.gmail.com>
2021-09-23  7:05   ` [PATCH 0/5] drm/vc4: hdmi: Remove CPU hangs, take 2 Michael Stapelberg
2021-09-23  7:05     ` Michael Stapelberg
2021-09-24  7:40 ` Maxime Ripard
2021-09-24  7:40   ` Maxime Ripard
2021-09-28 13:05   ` Maxime Ripard
2021-09-28 13:05     ` Maxime Ripard
2021-09-30 18:09     ` Stephen Boyd
2021-09-30 18:09       ` Stephen Boyd
2021-09-30 18:39       ` Florian Fainelli
2021-09-30 18:39         ` Florian Fainelli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210922125419.4125779-6-maxime@cerno.tech \
    --to=maxime@cerno.tech \
    --cc=airlied@linux.ie \
    --cc=daniel.vetter@intel.com \
    --cc=dave.stevenson@raspberrypi.com \
    --cc=f.fainelli@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-rpi-kernel@lists.infradead.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=michael@stapelberg.ch \
    --cc=mturquette@baylibre.com \
    --cc=nsaenz@kernel.org \
    --cc=sboyd@kernel.org \
    --cc=torvalds@linux-foundation.org \
    --cc=tzimmermann@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.