Skip to contentSkip to conversation

Patch "drm/bridge: adv7511: Switch to using drm_kms_helper_hotplug_event()" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Sep 8, 2017

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm/bridge: adv7511: Switch to using drm_kms_helper_hotplug_event()

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-bridge-adv7511-switch-to-using-drm_kms_helper_hotplug_event.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 6d5104c5a6b56385426e15047050584794bb6254 Mon Sep 17 00:00:00 2001

From: John Stultz <[email protected]>
Date: Mon, 16 Jan 2017 16:52:48 -0800
Subject: drm/bridge: adv7511: Switch to using drm_kms_helper_hotplug_event()

From: John Stultz <[email protected]>

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.

---
 drivers/gpu/drm/bridge/adv7511/adv7511_drv.c |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +15 -1
@@ -405,8 +405,22 @@ static bool adv7511_hpd(struct 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)

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/drm-bridge-adv7511-use-work_struct-to-defer-hotplug-handing-to-out-of-irq-context.patch queue-4.9/drm-bridge-adv7511-switch-to-using-drm_kms_helper_hotplug_event.patch