Skip to content

Commit e22a430

Browse files
johnstultz-workgregkh
authored andcommitted
drm/bridge: adv7511: Switch to using drm_kms_helper_hotplug_event()
commit 6d5104c5a6b56385426e15047050584794bb6254 upstream. 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> Signed-off-by: Archit Taneja <architt@codeaurora.org> Link: http://patchwork.freedesktop.org/patch/msgid/1484614372-15342-3-git-send-email-john.stultz@linaro.org Signed-off-by: Thong Ho <thong.ho.px@rvc.renesas.com> Signed-off-by: Nhan Nguyen <nhan.nguyen.yb@renesas.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9183e45 commit e22a430

1 file changed

Lines changed: 14 additions & 1 deletion

File tree

drivers/gpu/drm/i2c/adv7511.c

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,21 @@ static bool adv7511_hpd(struct adv7511 *adv7511)
435435
static void adv7511_hpd_work(struct work_struct *work)
436436
{
437437
struct adv7511 *adv7511 = container_of(work, struct adv7511, hpd_work);
438+
enum drm_connector_status status;
439+
unsigned int val;
440+
int ret;
441+
ret = regmap_read(adv7511->regmap, ADV7511_REG_STATUS, &val);
442+
if (ret < 0)
443+
status = connector_status_disconnected;
444+
else if (val & ADV7511_STATUS_HPD)
445+
status = connector_status_connected;
446+
else
447+
status = connector_status_disconnected;
438448

439-
drm_helper_hpd_irq_event(adv7511->connector.dev);
449+
if (adv7511->connector.status != status) {
450+
adv7511->connector.status = status;
451+
drm_kms_helper_hotplug_event(adv7511->connector.dev);
452+
}
440453
}
441454

442455
static int adv7511_irq_process(struct adv7511 *adv7511, bool process_hpd)

0 commit comments

Comments
 (0)