diff mbox

drm/i915: Treat eDP as always connected, again

Message ID 1468836914-16537-1-git-send-email-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ville Syrjälä July 18, 2016, 10:15 a.m. UTC 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

eDP should be treated as connected even if doesn't have an EDID. In that
case we'll use the timings from the VBT. That used to be the case until
commit f21a21983ef1 ("drm/i915: Splitting intel_dp_detect")
broke things by considering even eDP disconnected if we fail to get
an EDID for it.

Fix things up again by treating eDP as always connected.

Cc: Shubhangi Shrivastava <shubhangi.shrivastava@intel.com>
Cc: Nathan D Ciobanu <nathan.d.ciobanu@intel.com>
Cc: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
Cc: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Cc: Larry Finger <larry.finger@lwfinger.net>
Reported-by: Larry Finger <larry.finger@lwfinger.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96675
Cc: drm-intel-fixes@lists.freedesktop.org
Fixes: f21a21983ef1 ("drm/i915: Splitting intel_dp_detect")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Larry Finger <larry.finger@lwfinger.net>
---
 drivers/gpu/drm/i915/intel_dp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Daniel Vetter July 18, 2016, 12:29 p.m. UTC | #1 
On Mon, Jul 18, 2016 at 11:43:08AM -0000, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915: Treat eDP as always connected, again
> URL   : https://patchwork.freedesktop.org/series/9977/
> State : failure
> 
> == Summary ==
> 
> Series 9977v1 drm/i915: Treat eDP as always connected, again
> http://patchwork.freedesktop.org/api/1.0/series/9977/revisions/1/mbox
> 
> Test gem_exec_suspend:
>         Subgroup basic-s3:
>                 pass       -> DMESG-WARN (fi-skl-i5-6260u)
> Test gem_sync:
>         Subgroup basic-store-each:
>                 pass       -> DMESG-FAIL (ro-bdw-i7-5600u)

I tried to find the bug reports for these, and we don't track them. And at
least the 2nd one looks like it's a one-off, so who knows what's going on.

But while trying to figure out what's going on I stumbled over about 5
other sporadic CI issues in those boxes which aren't event tracked either.

/me cries

So normally not good enough for CI, but regressions win even against our
shitty CI. Hence applied and will cherry-pick over to -fixes.
-Daniel

> 
> fi-hsw-i7-4770k  total:242  pass:210  dwarn:0   dfail:0   fail:12  skip:20 
> fi-kbl-qkkr      total:242  pass:176  dwarn:27  dfail:0   fail:12  skip:27 
> fi-skl-i5-6260u  total:242  pass:218  dwarn:1   dfail:0   fail:11  skip:12 
> fi-skl-i7-6700k  total:107  pass:84   dwarn:0   dfail:0   fail:0   skip:22 
> fi-snb-i7-2600   total:242  pass:190  dwarn:0   dfail:0   fail:12  skip:40 
> ro-bdw-i5-5250u  total:243  pass:214  dwarn:4   dfail:0   fail:12  skip:13 
> ro-bdw-i7-5557U  total:243  pass:215  dwarn:0   dfail:0   fail:12  skip:16 
> ro-bdw-i7-5600u  total:243  pass:199  dwarn:0   dfail:1   fail:11  skip:32 
> ro-bsw-n3050     total:218  pass:173  dwarn:0   dfail:0   fail:2   skip:42 
> ro-byt-n2820     total:243  pass:191  dwarn:0   dfail:0   fail:14  skip:38 
> ro-hsw-i3-4010u  total:243  pass:206  dwarn:0   dfail:0   fail:13  skip:24 
> ro-hsw-i7-4770r  total:243  pass:206  dwarn:0   dfail:0   fail:13  skip:24 
> ro-ilk-i7-620lm  total:243  pass:166  dwarn:0   dfail:0   fail:14  skip:63 
> ro-ilk1-i5-650   total:238  pass:166  dwarn:0   dfail:0   fail:14  skip:58 
> ro-ivb-i7-3770   total:243  pass:197  dwarn:0   dfail:0   fail:13  skip:33 
> ro-skl3-i5-6260u total:243  pass:218  dwarn:1   dfail:0   fail:12  skip:12 
> ro-snb-i7-2620M  total:243  pass:188  dwarn:0   dfail:0   fail:13  skip:42 
> fi-bsw-n3050 failed to connect after reboot
> 
> Results at /archive/results/CI_IGT_test/RO_Patchwork_1517/
> 
> 74bd981 drm-intel-nightly: 2016y-07m-18d-10h-05m-42s UTC integration manifest
> c3022da drm/i915: Treat eDP as always connected, again
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Ville Syrjälä July 18, 2016, 12:45 p.m. UTC | #2 
On Mon, Jul 18, 2016 at 02:29:45PM +0200, Daniel Vetter wrote:
> On Mon, Jul 18, 2016 at 11:43:08AM -0000, Patchwork wrote:
> > == Series Details ==
> > 
> > Series: drm/i915: Treat eDP as always connected, again
> > URL   : https://patchwork.freedesktop.org/series/9977/
> > State : failure
> > 
> > == Summary ==
> > 
> > Series 9977v1 drm/i915: Treat eDP as always connected, again
> > http://patchwork.freedesktop.org/api/1.0/series/9977/revisions/1/mbox
> > 
> > Test gem_exec_suspend:
> >         Subgroup basic-s3:
> >                 pass       -> DMESG-WARN (fi-skl-i5-6260u)

This one might be fixed by:
https://lists.freedesktop.org/archives/intel-gfx/2016-July/100572.html

> > Test gem_sync:
> >         Subgroup basic-store-each:
> >                 pass       -> DMESG-FAIL (ro-bdw-i7-5600u)

Looks like this one has been failing sporadically at least for a while
now,

> 
> I tried to find the bug reports for these, and we don't track them. And at
> least the 2nd one looks like it's a one-off, so who knows what's going on.
> 
> But while trying to figure out what's going on I stumbled over about 5
> other sporadic CI issues in those boxes which aren't event tracked either.
> 
> /me cries
> 
> So normally not good enough for CI, but regressions win even against our
> shitty CI. Hence applied and will cherry-pick over to -fixes.
> -Daniel
> 
> > 
> > fi-hsw-i7-4770k  total:242  pass:210  dwarn:0   dfail:0   fail:12  skip:20 
> > fi-kbl-qkkr      total:242  pass:176  dwarn:27  dfail:0   fail:12  skip:27 
> > fi-skl-i5-6260u  total:242  pass:218  dwarn:1   dfail:0   fail:11  skip:12 
> > fi-skl-i7-6700k  total:107  pass:84   dwarn:0   dfail:0   fail:0   skip:22 
> > fi-snb-i7-2600   total:242  pass:190  dwarn:0   dfail:0   fail:12  skip:40 
> > ro-bdw-i5-5250u  total:243  pass:214  dwarn:4   dfail:0   fail:12  skip:13 
> > ro-bdw-i7-5557U  total:243  pass:215  dwarn:0   dfail:0   fail:12  skip:16 
> > ro-bdw-i7-5600u  total:243  pass:199  dwarn:0   dfail:1   fail:11  skip:32 
> > ro-bsw-n3050     total:218  pass:173  dwarn:0   dfail:0   fail:2   skip:42 
> > ro-byt-n2820     total:243  pass:191  dwarn:0   dfail:0   fail:14  skip:38 
> > ro-hsw-i3-4010u  total:243  pass:206  dwarn:0   dfail:0   fail:13  skip:24 
> > ro-hsw-i7-4770r  total:243  pass:206  dwarn:0   dfail:0   fail:13  skip:24 
> > ro-ilk-i7-620lm  total:243  pass:166  dwarn:0   dfail:0   fail:14  skip:63 
> > ro-ilk1-i5-650   total:238  pass:166  dwarn:0   dfail:0   fail:14  skip:58 
> > ro-ivb-i7-3770   total:243  pass:197  dwarn:0   dfail:0   fail:13  skip:33 
> > ro-skl3-i5-6260u total:243  pass:218  dwarn:1   dfail:0   fail:12  skip:12 
> > ro-snb-i7-2620M  total:243  pass:188  dwarn:0   dfail:0   fail:13  skip:42 
> > fi-bsw-n3050 failed to connect after reboot
> > 
> > Results at /archive/results/CI_IGT_test/RO_Patchwork_1517/
> > 
> > 74bd981 drm-intel-nightly: 2016y-07m-18d-10h-05m-42s UTC integration manifest
> > c3022da drm/i915: Treat eDP as always connected, again
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
Dave Gordon July 18, 2016, 12:50 p.m. UTC | #3 
On 18/07/16 13:29, Daniel Vetter wrote:
> On Mon, Jul 18, 2016 at 11:43:08AM -0000, Patchwork wrote:
>> == Series Details ==
>>
>> Series: drm/i915: Treat eDP as always connected, again
>> URL   : https://patchwork.freedesktop.org/series/9977/
>> State : failure
>>
>> == Summary ==
>>
>> Series 9977v1 drm/i915: Treat eDP as always connected, again
>> http://patchwork.freedesktop.org/api/1.0/series/9977/revisions/1/mbox
>>
>> Test gem_exec_suspend:
>>          Subgroup basic-s3:
>>                  pass       -> DMESG-WARN (fi-skl-i5-6260u)
>> Test gem_sync:
>>          Subgroup basic-store-each:
>>                  pass       -> DMESG-FAIL (ro-bdw-i7-5600u)
>
> I tried to find the bug reports for these, and we don't track them. And at
> least the 2nd one looks like it's a one-off, so who knows what's going on.
>
> But while trying to figure out what's going on I stumbled over about 5
> other sporadic CI issues in those boxes which aren't event tracked either.
>
> /me cries
>
> So normally not good enough for CI, but regressions win even against our
> shitty CI. Hence applied and will cherry-pick over to -fixes.
> -Daniel

Looks like the failure in basic-store-each has been happening since at 
least 2016-07-10, but only on one specific BDW machine 
(ro-bdw-i7-5600u). Failure is:

 > Failed assertion: intel_detect_and_clear_missed_interrupts(fd) == 0

Intermittent, though, as Chris's recent results show:

> Test gem_sync:
>         Subgroup basic-store-each:
>                 dmesg-fail -> PASS       (ro-bdw-i7-5600u)

making it very difficult to determine whether it's a real regression or 
some problem with that specific machine -- it doesn't happen on the 
other BDWs, but they're all slightly different.

.Dave.

>> fi-hsw-i7-4770k  total:242  pass:210  dwarn:0   dfail:0   fail:12  skip:20
>> fi-kbl-qkkr      total:242  pass:176  dwarn:27  dfail:0   fail:12  skip:27
>> fi-skl-i5-6260u  total:242  pass:218  dwarn:1   dfail:0   fail:11  skip:12
>> fi-skl-i7-6700k  total:107  pass:84   dwarn:0   dfail:0   fail:0   skip:22
>> fi-snb-i7-2600   total:242  pass:190  dwarn:0   dfail:0   fail:12  skip:40
>> ro-bdw-i5-5250u  total:243  pass:214  dwarn:4   dfail:0   fail:12  skip:13
>> ro-bdw-i7-5557U  total:243  pass:215  dwarn:0   dfail:0   fail:12  skip:16
>> ro-bdw-i7-5600u  total:243  pass:199  dwarn:0   dfail:1   fail:11  skip:32
>> ro-bsw-n3050     total:218  pass:173  dwarn:0   dfail:0   fail:2   skip:42
>> ro-byt-n2820     total:243  pass:191  dwarn:0   dfail:0   fail:14  skip:38
>> ro-hsw-i3-4010u  total:243  pass:206  dwarn:0   dfail:0   fail:13  skip:24
>> ro-hsw-i7-4770r  total:243  pass:206  dwarn:0   dfail:0   fail:13  skip:24
>> ro-ilk-i7-620lm  total:243  pass:166  dwarn:0   dfail:0   fail:14  skip:63
>> ro-ilk1-i5-650   total:238  pass:166  dwarn:0   dfail:0   fail:14  skip:58
>> ro-ivb-i7-3770   total:243  pass:197  dwarn:0   dfail:0   fail:13  skip:33
>> ro-skl3-i5-6260u total:243  pass:218  dwarn:1   dfail:0   fail:12  skip:12
>> ro-snb-i7-2620M  total:243  pass:188  dwarn:0   dfail:0   fail:13  skip:42
>> fi-bsw-n3050 failed to connect after reboot
>>
>> Results at /archive/results/CI_IGT_test/RO_Patchwork_1517/
>>
>> 74bd981 drm-intel-nightly: 2016y-07m-18d-10h-05m-42s UTC integration manifest
>> c3022da drm/i915: Treat eDP as always connected, again
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
Dave Gordon July 18, 2016, 1:01 p.m. UTC | #4 
On 18/07/16 13:50, Dave Gordon wrote:
> On 18/07/16 13:29, Daniel Vetter wrote:
>> On Mon, Jul 18, 2016 at 11:43:08AM -0000, Patchwork wrote:
>>> == Series Details ==
>>>
>>> Series: drm/i915: Treat eDP as always connected, again
>>> URL   : https://patchwork.freedesktop.org/series/9977/
>>> State : failure
>>>
>>> == Summary ==
>>>
>>> Series 9977v1 drm/i915: Treat eDP as always connected, again
>>> http://patchwork.freedesktop.org/api/1.0/series/9977/revisions/1/mbox
>>>
>>> Test gem_exec_suspend:
>>>          Subgroup basic-s3:
>>>                  pass       -> DMESG-WARN (fi-skl-i5-6260u)
>>> Test gem_sync:
>>>          Subgroup basic-store-each:
>>>                  pass       -> DMESG-FAIL (ro-bdw-i7-5600u)
>>
>> I tried to find the bug reports for these, and we don't track them.
>> And at
>> least the 2nd one looks like it's a one-off, so who knows what's going
>> on.
>>
>> But while trying to figure out what's going on I stumbled over about 5
>> other sporadic CI issues in those boxes which aren't event tracked
>> either.
>>
>> /me cries
>>
>> So normally not good enough for CI, but regressions win even against our
>> shitty CI. Hence applied and will cherry-pick over to -fixes.
>> -Daniel
>
> Looks like the failure in basic-store-each has been happening since at
> least 2016-07-10, but only on one specific BDW machine
> (ro-bdw-i7-5600u). Failure is:
>
>  > Failed assertion: intel_detect_and_clear_missed_interrupts(fd) == 0
>
> Intermittent, though, as Chris's recent results show:
>
>> Test gem_sync:
>>         Subgroup basic-store-each:
>>                 dmesg-fail -> PASS       (ro-bdw-i7-5600u)
>
> making it very difficult to determine whether it's a real regression or
> some problem with that specific machine -- it doesn't happen on the
> other BDWs, but they're all slightly different.
>
> .Dave.

Bug filed: Bug 96975 - [BAT BDW] basic-store-each fails, 
intel_detect_and_clear_missed_interrupts(fd) == 0

.Dave.
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 0c5ba3410a1e..21b04c3eda41 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4336,7 +4336,7 @@  intel_dp_detect(struct drm_connector *connector, bool force)
 
 	intel_dp->detect_done = false;
 
-	if (intel_connector->detect_edid)
+	if (is_edp(intel_dp) || intel_connector->detect_edid)
 		return connector_status_connected;
 	else
 		return connector_status_disconnected;