From: Michael Rodin <mrodin@de.adit-jv.com>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
Dave Airlie <airlied@redhat.com>,
Alex Deucher <alexander.deucher@amd.com>,
<dri-devel@lists.freedesktop.org>, <linux-kernel@vger.kernel.org>
Cc: michael@rodin.online, Michael Rodin <mrodin@de.adit-jv.com>,
erosca@de.adit-jv.com, laurent.pinchart@ideasonboard.com
Subject: [PATCH] drm: override detected status for connectors which are forced on
Date: Thu, 15 Dec 2022 18:03:59 +0100 [thread overview]
Message-ID: <20221215170359.92422-1-mrodin@de.adit-jv.com> (raw)
In-Reply-To: <20221107123657.24vbgep3jqeklb2s@houat>
The detected status of a connector should be ignored when a connector is
forced as hinted in the commit d50ba256b5f1 ("drm/kms: start
adding command line interface using fb."). One negative side effect of
not ignoring this is observed on the RCar3 SoCs which use the dw-hdmi
driver. It continues executing drm_helper_hpd_irq_event even if its
connector is forced to ON. As consequence drm_helper_hpd_irq_event calls
"detect" so the connector status is updated to "disconnected":
[ 420.201527] [drm:drm_helper_hpd_irq_event] [CONNECTOR:76:HDMI-A-1] status updated from connected to disconnected
This status is corrected by drm_helper_probe_single_connector_modes shortly
after this because this function checks if a connector is forced:
[ 420.218703] [drm:drm_helper_probe_single_connector_modes] [CONNECTOR:76:HDMI-A-1] status updated from disconnected to connected
To avoid similar issues this commit adapts functions which call "detect"
so they check additionally if a connector is forced and override the status
returned by "detect".
Fixes: 816da85a0990 ("drm: handle HPD and polled connectors separately")
Signed-off-by: Michael Rodin <mrodin@de.adit-jv.com>
---
drivers/gpu/drm/drm_probe_helper.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
index bcd9611dabfd..0a3b8223c87a 100644
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -304,6 +304,12 @@ drm_helper_probe_detect_ctx(struct drm_connector *connector, bool force)
if (WARN_ON(ret < 0))
ret = connector_status_unknown;
+ if (connector->force == DRM_FORCE_ON ||
+ connector->force == DRM_FORCE_ON_DIGITAL)
+ ret = connector_status_connected;
+ else if (connector->force == DRM_FORCE_OFF)
+ ret = connector_status_disconnected;
+
if (ret != connector->status)
connector->epoch_counter += 1;
@@ -346,6 +352,12 @@ drm_helper_probe_detect(struct drm_connector *connector,
else
ret = connector_status_connected;
+ if (connector->force == DRM_FORCE_ON ||
+ connector->force == DRM_FORCE_ON_DIGITAL)
+ ret = connector_status_connected;
+ else if (connector->force == DRM_FORCE_OFF)
+ ret = connector_status_disconnected;
+
if (ret != connector->status)
connector->epoch_counter += 1;
--
2.25.1
next prev parent reply other threads:[~2022-12-15 17:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-26 9:11 [PATCH] drm: do not call detect for connectors which are forced on Michael Rodin
2022-09-29 23:33 ` Laurent Pinchart
2022-11-07 12:25 ` Maxime Ripard
2022-11-07 12:36 ` Maxime Ripard
2022-12-15 17:03 ` Michael Rodin [this message]
2022-12-22 17:40 ` [PATCH] drm: override detected status " Maxime Ripard
2023-01-20 9:03 ` Michael Rodin
2023-01-27 13:57 ` Maxime Ripard
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=20221215170359.92422-1-mrodin@de.adit-jv.com \
--to=mrodin@de.adit-jv.com \
--cc=airlied@gmail.com \
--cc=airlied@redhat.com \
--cc=alexander.deucher@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=erosca@de.adit-jv.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=michael@rodin.online \
--cc=mripard@kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).