From: John Stultz <john.stultz@linaro.org>
To: lkml <linux-kernel@vger.kernel.org>
Cc: John Stultz <john.stultz@linaro.org>,
David Airlie <airlied@linux.ie>,
Archit Taneja <architt@codeaurora.org>,
Wolfram Sang <wsa+renesas@sang-engineering.com>,
Lars-Peter Clausen <lars@metafoo.de>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
dri-devel@lists.freedesktop.org
Subject: [PATCH 2/6] drm/bridge: adv7511: Switch to using drm_kms_helper_hotplug_event()
Date: Mon, 16 Jan 2017 16:52:48 -0800 [thread overview]
Message-ID: <1484614372-15342-3-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1484614372-15342-1-git-send-email-john.stultz@linaro.org>
In chasing down a previous issue with EDID probing from calling
drm_helper_hpd_irq_event() from irq context, Laurent noticed
that the DRM documentation suggests that
drm_kms_helper_hotplug_event() should be used instead.
Thus this patch replaces drm_helper_hpd_irq_event() with
drm_kms_helper_hotplug_event(), which requires we update the
connector.status entry and only call _hotplug_event() when the
status changes.
Cc: David Airlie <airlied@linux.ie>
Cc: Archit Taneja <architt@codeaurora.org>
Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: dri-devel@lists.freedesktop.org
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
v3: Update connector.status value and only call __hotplug_event()
when that status changes, as suggested by Laurent.
v4: Set adv7511->connector.status before calling
adv7511->connector.status, as suggested by Laurent.
---
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index 4fcea44..7b2b5af 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -405,8 +405,22 @@ static bool adv7511_hpd(struct adv7511 *adv7511)
static void adv7511_hpd_work(struct work_struct *work)
{
struct adv7511 *adv7511 = container_of(work, struct adv7511, hpd_work);
+ enum drm_connector_status status;
+ unsigned int val;
+ int ret;
- drm_helper_hpd_irq_event(adv7511->connector.dev);
+ ret = regmap_read(adv7511->regmap, ADV7511_REG_STATUS, &val);
+ if (ret < 0)
+ status = connector_status_disconnected;
+ else if (val & ADV7511_STATUS_HPD)
+ status = connector_status_connected;
+ else
+ status = connector_status_disconnected;
+
+ if (adv7511->connector.status != status) {
+ adv7511->connector.status = status;
+ drm_kms_helper_hotplug_event(adv7511->connector.dev);
+ }
}
static int adv7511_irq_process(struct adv7511 *adv7511, bool process_hpd)
--
2.7.4
next prev parent reply other threads:[~2017-01-17 0:55 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-17 0:52 [PATCH 0/6 v4] adv7511 EDID probing improvements John Stultz
2017-01-17 0:52 ` [PATCH 1/6] drm/bridge: adv7511: Use work_struct to defer hotplug handing to out of irq context John Stultz
2017-01-17 0:52 ` John Stultz [this message]
2017-01-17 0:52 ` [PATCH 3/6] drm/bridge: adv7511: Enable HPD interrupts to support hotplug and improve monitor detection John Stultz
2017-01-17 0:52 ` [PATCH 4/6] drm/bridge: adv7511: Rework adv7511_power_on/off() so they can be reused internally John Stultz
2017-01-18 23:04 ` Laurent Pinchart
2017-01-17 0:52 ` [PATCH 5/6] drm/bridge: adv7511: Reuse __adv7511_power_on/off() when probing EDID John Stultz
2017-01-18 23:05 ` Laurent Pinchart
2017-01-17 0:52 ` [PATCH 6/6] drm/bridge: adv7511: Re-write the i2c address before EDID probing John Stultz
2017-01-18 23:06 ` Laurent Pinchart
2017-01-18 23:04 ` [PATCH 0/6 v4] adv7511 EDID probing improvements Laurent Pinchart
2017-01-19 5:22 ` Archit Taneja
2017-01-19 7:37 ` John Stultz
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=1484614372-15342-3-git-send-email-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=airlied@linux.ie \
--cc=architt@codeaurora.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=lars@metafoo.de \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=wsa+renesas@sang-engineering.com \
/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).