Attachment 116358 Details for Bug 82593 – drm/i915: wait a little before queuing hotplug work functions

[patch] drm/i915: wait a little before queuing hotplug work functions

0001-drm-i915-wait-a-little-before-queuing-hotplug-work-f.patch (text/plain), 4.47 KB, created by Jani Nikula on 2015-06-08 08:35:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jani Nikula

Created: 2015-06-08 08:35:58 UTC

Size: 4.47 KB

patch

obsolete

>From 0cca02a2277700f81bdf18b162d0666e0f29f866 Mon Sep 17 00:00:00 2001
>From: Jani Nikula <jani.nikula@intel.com>
>Date: Mon, 8 Jun 2015 11:35:48 +0300
>Subject: [PATCH] drm/i915: wait a little before queuing hotplug work functions
>Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
>Cc: Jani Nikula <jani.nikula@intel.com>
>
>Maybe the connector is still partially plugged when unplugging, and hdmi
>detection succeeds just before the cable is completely removed?
>
>Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>---
> drivers/gpu/drm/i915/i915_drv.c |  4 ++--
> drivers/gpu/drm/i915/i915_drv.h |  4 ++--
> drivers/gpu/drm/i915/i915_irq.c | 17 ++++++++++-------
> 3 files changed, 14 insertions(+), 11 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>index d3632c56fdf7..f16e6c410f87 100644
>--- a/drivers/gpu/drm/i915/i915_drv.c
>+++ b/drivers/gpu/drm/i915/i915_drv.c
>@@ -551,8 +551,8 @@ void intel_hpd_cancel_work(struct drm_i915_private *dev_priv)
> 
> 	spin_unlock_irq(&dev_priv->irq_lock);
> 
>-	cancel_work_sync(&dev_priv->hotplug.dig_port_work);
>-	cancel_work_sync(&dev_priv->hotplug.hotplug_work);
>+	cancel_delayed_work_sync(&dev_priv->hotplug.dig_port_work);
>+	cancel_delayed_work_sync(&dev_priv->hotplug.hotplug_work);
> 	cancel_delayed_work_sync(&dev_priv->hotplug.reenable_work);
> }
> 
>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>index 611fbd86c1cc..2893aab63adf 100644
>--- a/drivers/gpu/drm/i915/i915_drv.h
>+++ b/drivers/gpu/drm/i915/i915_drv.h
>@@ -221,7 +221,7 @@ enum hpd_pin {
> 	for ((__pin) = (HPD_NONE + 1); (__pin) < HPD_NUM_PINS; (__pin)++)
> 
> struct i915_hotplug {
>-	struct work_struct hotplug_work;
>+	struct delayed_work hotplug_work;
> 
> 	struct {
> 		unsigned long last_jiffies;
>@@ -238,7 +238,7 @@ struct i915_hotplug {
> 	struct intel_digital_port *irq_port[I915_MAX_PORTS];
> 	u32 long_port_mask;
> 	u32 short_port_mask;
>-	struct work_struct dig_port_work;
>+	struct delayed_work dig_port_work;
> 
> 	/*
> 	 * if we get a HPD irq from DP and a HPD irq from non-DP
>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index 56db9e747464..a081b661dd42 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -831,7 +831,7 @@ static bool intel_hpd_irq_event(struct drm_device *dev,
> static void i915_digport_work_func(struct work_struct *work)
> {
> 	struct drm_i915_private *dev_priv =
>-		container_of(work, struct drm_i915_private, hotplug.dig_port_work);
>+		container_of(work, struct drm_i915_private, hotplug.dig_port_work.work);
> 	u32 long_port_mask, short_port_mask;
> 	struct intel_digital_port *intel_dig_port;
> 	int i;
>@@ -872,7 +872,7 @@ static void i915_digport_work_func(struct work_struct *work)
> 		spin_lock_irq(&dev_priv->irq_lock);
> 		dev_priv->hotplug.event_bits |= old_bits;
> 		spin_unlock_irq(&dev_priv->irq_lock);
>-		schedule_work(&dev_priv->hotplug.hotplug_work);
>+		mod_delayed_work(system_wq, &dev_priv->hotplug.hotplug_work, 0);
> 	}
> }
> 
>@@ -884,7 +884,7 @@ static void i915_digport_work_func(struct work_struct *work)
> static void i915_hotplug_work_func(struct work_struct *work)
> {
> 	struct drm_i915_private *dev_priv =
>-		container_of(work, struct drm_i915_private, hotplug.hotplug_work);
>+		container_of(work, struct drm_i915_private, hotplug.hotplug_work.work);
> 	struct drm_device *dev = dev_priv->dev;
> 	struct drm_mode_config *mode_config = &dev->mode_config;
> 	struct intel_connector *intel_connector;
>@@ -1599,9 +1599,12 @@ static void intel_hpd_irq_handler(struct drm_device *dev,
> 	 * deadlock.
> 	 */
> 	if (queue_dig)
>-		queue_work(dev_priv->hotplug.dp_wq, &dev_priv->hotplug.dig_port_work);
>+		mod_delayed_work(dev_priv->hotplug.dp_wq,
>+				 &dev_priv->hotplug.dig_port_work,
>+				 msecs_to_jiffies(100));
> 	if (queue_hp)
>-		schedule_work(&dev_priv->hotplug.hotplug_work);
>+		mod_delayed_work(system_wq, &dev_priv->hotplug.hotplug_work,
>+				 msecs_to_jiffies(400));
> }
> 
> static void gmbus_irq_handler(struct drm_device *dev)
>@@ -4397,8 +4400,8 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
> {
> 	struct drm_device *dev = dev_priv->dev;
> 
>-	INIT_WORK(&dev_priv->hotplug.hotplug_work, i915_hotplug_work_func);
>-	INIT_WORK(&dev_priv->hotplug.dig_port_work, i915_digport_work_func);
>+	INIT_DELAYED_WORK(&dev_priv->hotplug.hotplug_work, i915_hotplug_work_func);
>+	INIT_DELAYED_WORK(&dev_priv->hotplug.dig_port_work, i915_digport_work_func);
> 	INIT_WORK(&dev_priv->rps.work, gen6_pm_rps_work);
> 	INIT_WORK(&dev_priv->l3_parity.error_work, ivybridge_parity_work);
> 
>-- 
>2.1.4
>

Actions: View | Splinter Review

Attachments on bug 82593: 104597 | 106403 | 106892 | 106980 | 116183 | 116225 | 116358 | 116496 | 116497

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.