Skip to contentSkip to conversation

drm/i915: fix hotplug event bit tracking

PATCH Applied Jani Nikula 2 participants 5 messages May 7, 2013 – May 9, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: fix hotplug event bit tracking

commit 142e239849c800f9dc23f828762873073f612d3f

Author: Egbert Eich <[email protected]>
Date:   Thu Apr 11 15:57:57 2013 +0200

drm/i915: Add bit field to record which pins have received HPD events (v3)

added a bit field for hotplug event tracking. There ended up being three different v3 of the patch: [1], [2], and [3]. Apparently [1] was the correct one, but some frankenstein combination of the three got committed, which reversed the logic for setting the hotplug bits and misplaced a continue statement, skipping the hotplug irq storm handling altogether.

This lead to broken hotplug detection, bisected to commit 321a1b3026ea194dd084cf3bda1e235b2986b0af

Author: Egbert Eich <[email protected]>
Date:   Thu Apr 11 16:00:26 2013 +0200

drm/i915: Only reprobe display on encoder which has received an HPD event (v2)

which uses the incorrectly set hotplug event bits.

Fix the mess.

[1] http://mid.gmane.org/[email protected]
[2] http://mid.gmane.org/[email protected]
[3] http://mid.gmane.org/[email protected]

---
 drivers/gpu/drm/i915/i915_irq.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_irq.c +1 -1
index 03a31be..43e0e9e 100644
@@ -878,9 +878,9 @@ static inline bool hotplug_irq_storm_detect(struct drm_device *dev,
 
 		if (!(hpd[i] & hotplug_trigger) ||
 		    dev_priv->hpd_stats[i].hpd_mark != HPD_ENABLED)
-			dev_priv->hpd_event_bits |= (1 << i);
 			continue;
 
+		dev_priv->hpd_event_bits |= (1 << i);
 		if (!time_in_range(jiffies, dev_priv->hpd_stats[i].hpd_last_jiffies,
 				   dev_priv->hpd_stats[i].hpd_last_jiffies
 				   + msecs_to_jiffies(HPD_STORM_DETECT_PERIOD))) {
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 22 lines · Jani Nikula

commit 142e239849c800f9dc23f828762873073f612d3f

Author: Egbert Eich <[email protected]>
Date:   Thu Apr 11 15:57:57 2013 +0200

drm/i915: Add bit field to record which pins have received HPD events (v3)

added a bit field for hotplug event tracking. There ended up being three different v3 of the patch: [1], [2], and [3]. Apparently [1] was the correct one, but some frankenstein combination of the three got committed, which reversed the logic for setting the hotplug bits and misplaced a continue statement, skipping the hotplug irq storm handling altogether.

This lead to broken hotplug detection, bisected to commit 321a1b3026ea194dd084cf3bda1e235b2986b0af

Author: Egbert Eich <[email protected]>
Date:   Thu Apr 11 16:00:26 2013 +0200

drm/i915: Only reprobe display on encoder which has received an HPD event (v2)

which uses the incorrectly set hotplug event bits.

Quoted 7 lines

Fix the mess.

[1] http://mid.gmane.org/[email protected]
[2] http://mid.gmane.org/[email protected]
[3] http://mid.gmane.org/[email protected]

/me hangs head in shame

Queued for -next, thanks for the patch.
-Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
#2 lore raw
Quoted 1 line · Daniel Vetter

Queued for -next, thanks for the patch.

Shouldn't this be headed for 3.10 through -fixes?

Jani.

#3 lore raw
Quoted 4 lines · Jani Nikula
Quoted 1 line · Daniel Vetter

Queued for -next, thanks for the patch.

Shouldn't this be headed for 3.10 through -fixes?

The hpd filtering is only in -next thus far. Or have I botched up my patch tracking again?
-Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
#4 lore raw
Quoted 8 lines · Daniel Vetter
Quoted 4 lines · Jani Nikula
Quoted 1 line · Daniel Vetter

Queued for -next, thanks for the patch.

Shouldn't this be headed for 3.10 through -fixes?

The hpd filtering is only in -next thus far. Or have I botched up my patch tracking again?

No, my mistake, sorry for the noise.

J.