* [PATCH] drm/i915: fix hotplug event bit tracking
@ 2013-05-07 12:10 Jani Nikula
2013-05-08 12:44 ` Daniel Vetter
0 siblings, 1 reply; 5+ messages in thread
From: Jani Nikula @ 2013-05-07 12:10 UTC (permalink / raw)
To: intel-gfx, Egbert Eich, daniel; +Cc: jani.nikula
commit 142e239849c800f9dc23f828762873073f612d3f
Author: Egbert Eich <eich@suse.de>
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 <eich@suse.de>
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/1366112220-7638-6-git-send-email-eich@suse.de
[2] http://mid.gmane.org/1365688677-13682-1-git-send-email-eich@suse.de
[3] http://mid.gmane.org/1365688996-13874-1-git-send-email-eich@suse.de
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_irq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 03a31be..43e0e9e 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -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))) {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] drm/i915: fix hotplug event bit tracking
2013-05-07 12:10 [PATCH] drm/i915: fix hotplug event bit tracking Jani Nikula
@ 2013-05-08 12:44 ` Daniel Vetter
2013-05-09 8:47 ` Jani Nikula
0 siblings, 1 reply; 5+ messages in thread
From: Daniel Vetter @ 2013-05-08 12:44 UTC (permalink / raw)
To: Jani Nikula; +Cc: Egbert Eich, intel-gfx
On Tue, May 07, 2013 at 03:10:29PM +0300, Jani Nikula wrote:
> commit 142e239849c800f9dc23f828762873073f612d3f
> Author: Egbert Eich <eich@suse.de>
> 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 <eich@suse.de>
> 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/1366112220-7638-6-git-send-email-eich@suse.de
> [2] http://mid.gmane.org/1365688677-13682-1-git-send-email-eich@suse.de
> [3] http://mid.gmane.org/1365688996-13874-1-git-send-email-eich@suse.de
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
/me hangs head in shame
Queued for -next, thanks for the patch.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: fix hotplug event bit tracking
2013-05-08 12:44 ` Daniel Vetter
@ 2013-05-09 8:47 ` Jani Nikula
2013-05-09 9:41 ` Daniel Vetter
0 siblings, 1 reply; 5+ messages in thread
From: Jani Nikula @ 2013-05-09 8:47 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Egbert Eich, intel-gfx
On Wed, 08 May 2013, Daniel Vetter <daniel@ffwll.ch> wrote:
> Queued for -next, thanks for the patch.
Shouldn't this be headed for 3.10 through -fixes?
Jani.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: fix hotplug event bit tracking
2013-05-09 8:47 ` Jani Nikula
@ 2013-05-09 9:41 ` Daniel Vetter
2013-05-09 10:47 ` Jani Nikula
0 siblings, 1 reply; 5+ messages in thread
From: Daniel Vetter @ 2013-05-09 9:41 UTC (permalink / raw)
To: Jani Nikula; +Cc: Egbert Eich, intel-gfx
On Thu, May 09, 2013 at 11:47:01AM +0300, Jani Nikula wrote:
> On Wed, 08 May 2013, Daniel Vetter <daniel@ffwll.ch> wrote:
> > 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
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: fix hotplug event bit tracking
2013-05-09 9:41 ` Daniel Vetter
@ 2013-05-09 10:47 ` Jani Nikula
0 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2013-05-09 10:47 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Egbert Eich, intel-gfx
On Thu, 09 May 2013, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Thu, May 09, 2013 at 11:47:01AM +0300, Jani Nikula wrote:
>> On Wed, 08 May 2013, Daniel Vetter <daniel@ffwll.ch> wrote:
>> > 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.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-05-09 10:49 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-07 12:10 [PATCH] drm/i915: fix hotplug event bit tracking Jani Nikula
2013-05-08 12:44 ` Daniel Vetter
2013-05-09 8:47 ` Jani Nikula
2013-05-09 9:41 ` Daniel Vetter
2013-05-09 10:47 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox