Attachment 62017 Details for Bug 49906 – fixup polling for hotplug pins

[patch] fixup polling for hotplug pins

0001-drm-fix-up-output-detecting-for-HPD-capable-connecto.patch (text/plain), 3.89 KB, created by Daniel Vetter on 2012-05-23 06:02:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2012-05-23 06:02:13 UTC

Size: 3.89 KB

patch

obsolete

>From e9fcd259417f0e4b71877203177215a2ff982a49 Mon Sep 17 00:00:00 2001
>From: Daniel Vetter <daniel.vetter@ffwll.ch>
>Date: Wed, 23 May 2012 14:57:57 +0200
>Subject: [PATCH] drm: fix up output detecting for HPD capable connectors
>
>The polling loop checked for !connector->polled, but this is never
>zero because DRM_CONNECTOR_POLL_HPD == 1. Fix that.
>
>With that we hit the next bug that drivers abuse this work item to
>send out the hotplug uevent when getting a hotplug event. But since we
>now properly skip hotplug capable connectors, this won't happen.
>
>So split the uevent and fbcon udpating part into it's own function and
>fire off just that part with a separate hotplug work
>
>Bugzilla: https://bugs.freedesktop.org/attachment.cgi?id=61612
>Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>---
> drivers/gpu/drm/drm_crtc_helper.c |   35 +++++++++++++++++++++--------------
> include/drm/drm_crtc.h            |    1 +
> 2 files changed, 22 insertions(+), 14 deletions(-)
>
>diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
>index 974196a..23be120 100644
>--- a/drivers/gpu/drm/drm_crtc_helper.c
>+++ b/drivers/gpu/drm/drm_crtc_helper.c
>@@ -918,6 +918,15 @@ int drm_helper_resume_force_mode(struct drm_device *dev)
> }
> EXPORT_SYMBOL(drm_helper_resume_force_mode);
> 
>+static void handle_output_change(struct drm_device *dev)
>+{
>+	/* send a uevent + call fbdev */
>+	drm_sysfs_hotplug_event(dev);
>+	if (dev->mode_config.funcs->output_poll_changed)
>+		dev->mode_config.funcs->output_poll_changed(dev);
>+
>+}
>+
> #define DRM_OUTPUT_POLL_PERIOD (10*HZ)
> static void output_poll_execute(struct work_struct *work)
> {
>@@ -935,7 +944,7 @@ static void output_poll_execute(struct work_struct *work)
> 
> 		/* if this is HPD or polled don't check it -
> 		   TV out for instance */
>-		if (!connector->polled)
>+		if (connector->polled == DRM_CONNECTOR_POLL_HPD)
> 			continue;
> 
> 		else if (connector->polled & (DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT))
>@@ -960,17 +969,20 @@ static void output_poll_execute(struct work_struct *work)
> 
> 	mutex_unlock(&dev->mode_config.mutex);
> 
>-	if (changed) {
>-		/* send a uevent + call fbdev */
>-		drm_sysfs_hotplug_event(dev);
>-		if (dev->mode_config.funcs->output_poll_changed)
>-			dev->mode_config.funcs->output_poll_changed(dev);
>-	}
>+	if (changed)
>+		handle_output_change(dev);
> 
> 	if (repoll)
> 		queue_delayed_work(system_nrt_wq, delayed_work, DRM_OUTPUT_POLL_PERIOD);
> }
> 
>+static void hotplug_execute(struct work_struct *work)
>+{
>+	struct drm_device *dev = container_of(work, struct drm_device, mode_config.hotplug_work);
>+
>+	handle_output_change(dev);
>+}
>+
> void drm_kms_helper_poll_disable(struct drm_device *dev)
> {
> 	if (!dev->mode_config.poll_enabled)
>@@ -1000,6 +1012,7 @@ EXPORT_SYMBOL(drm_kms_helper_poll_enable);
> void drm_kms_helper_poll_init(struct drm_device *dev)
> {
> 	INIT_DELAYED_WORK(&dev->mode_config.output_poll_work, output_poll_execute);
>+	INIT_WORK(&dev->mode_config.hotplug_work, hotplug_execute);
> 	dev->mode_config.poll_enabled = true;
> 
> 	drm_kms_helper_poll_enable(dev);
>@@ -1014,12 +1027,6 @@ EXPORT_SYMBOL(drm_kms_helper_poll_fini);
> 
> void drm_helper_hpd_irq_event(struct drm_device *dev)
> {
>-	if (!dev->mode_config.poll_enabled)
>-		return;
>-
>-	/* kill timer and schedule immediate execution, this doesn't block */
>-	cancel_delayed_work(&dev->mode_config.output_poll_work);
>-	if (drm_kms_helper_poll)
>-		queue_delayed_work(system_nrt_wq, &dev->mode_config.output_poll_work, 0);
>+	schedule_work(&dev->mode_config.hotplug_work);
> }
> EXPORT_SYMBOL(drm_helper_hpd_irq_event);
>diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
>index d59bb7d..98b1e5a 100644
>--- a/include/drm/drm_crtc.h
>+++ b/include/drm/drm_crtc.h
>@@ -780,6 +780,7 @@ struct drm_mode_config {
> 	/* output poll support */
> 	bool poll_enabled;
> 	struct delayed_work output_poll_work;
>+	struct work_struct hotplug_work;
> 
> 	/* pointers to standard properties */
> 	struct list_head property_blob_list;
>-- 
>1.7.10
>

Actions: View | Splinter Review

Attachments on bug 49906: 61612 | 62017

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.