Skip to contentSkip to conversation

drm/i915: Do not return unknown status when load detection is tested.

PATCH In review Maarten Lankhorst 3 participants 5 messages Mar 1, 2016

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

PATCH 1/1 drm/i915: Do not return unknown status when load detection is tested.

This fixes the IGT test, which interprets unknown status as failed to acquire load detect pipe.

---
 drivers/gpu/drm/i915/intel_crt.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_crt.c +2 -0
index 505fc5cf26f8..4b2dfa1bb00e 100644
@@ -652,6 +652,8 @@ intel_crt_detect(struct drm_connector *connector, bool force)
 		else if (INTEL_INFO(dev)->gen < 4)
 			status = intel_crt_load_detect(crt,
 				to_intel_crtc(connector->state->crtc)->pipe);
+		else if (i915.load_detect_test)
+			status = connector_status_disconnected;
 		else
 			status = connector_status_unknown;
 		intel_release_load_detect_pipe(connector, &tmp, &ctx);
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✗ Fi.CI.BAT: failure for drm/i915: Do not return unknown status when load detection is tested.

== Series Details ==

== Series Details ==

Series: drm/i915: Do not return unknown status when load detection is tested.
URL : https://patchwork.freedesktop.org/series/3978/
State : failure

== Summary ==

Series 3978v1 drm/i915: Do not return unknown status when load detection is tested.
http://patchwork.freedesktop.org/api/1.0/series/3978/revisions/1/mbox/

Test kms_flip:

        Subgroup basic-flip-vs-dpms:
                pass       -> DMESG-WARN (ilk-hp8440p) UNSTABLE
        Subgroup basic-flip-vs-wf_vblank:
                dmesg-warn -> PASS       (hsw-gt2)
                pass       -> DMESG-WARN (hsw-brixbox)
Test kms_force_connector_basic:
        Subgroup force-load-detect:
                fail       -> PASS       (hsw-gt2)
                fail       -> PASS       (snb-dellxps)
                fail       -> PASS       (ilk-hp8440p)
                skip       -> PASS       (ivb-t430s)
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-c:
                pass       -> DMESG-WARN (bsw-nuc-2)
Test pm_rpm:
        Subgroup basic-pci-d3-state:
                pass       -> DMESG-WARN (bsw-nuc-2)
bdw-nuci7        total:169  pass:158  dwarn:0   dfail:0   fail:0   skip:11 
bdw-ultra        total:169  pass:155  dwarn:0   dfail:0   fail:0   skip:14 
bsw-nuc-2        total:169  pass:136  dwarn:2   dfail:0   fail:1   skip:30 
byt-nuc          total:169  pass:144  dwarn:0   dfail:0   fail:0   skip:25 
hsw-brixbox      total:169  pass:153  dwarn:1   dfail:0   fail:0   skip:15 
hsw-gt2          total:169  pass:159  dwarn:0   dfail:0   fail:0   skip:10 
ilk-hp8440p      total:169  pass:117  dwarn:1   dfail:0   fail:1   skip:50 
ivb-t430s        total:169  pass:154  dwarn:0   dfail:0   fail:0   skip:15 
skl-i5k-2        total:169  pass:153  dwarn:0   dfail:0   fail:0   skip:16 
skl-i7k-2        total:169  pass:153  dwarn:0   dfail:0   fail:0   skip:16 
snb-dellxps      total:169  pass:144  dwarn:2   dfail:0   fail:0   skip:23 

Results at /archive/results/CI_IGT_test/Patchwork_1505/

bb25273010c1ea81428ad36a53058ef286653283 drm-intel-nightly: 2016y-03m-01d-15h-09m-38s UTC integration manifest 54419dbfc2c03e8b5150ac1b76a5c20f540b9dfc drm/i915: Do not return unknown status when load detection is tested.

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
In reply to Maarten Lankhorst
Quoted 2 lines · Maarten Lankhorst

This fixes the IGT test, which interprets unknown status as failed to acquire load detect pipe.

Change the expectation of the test?

But more importantly, how can it fail to find a pipe when there's kmstest_unset_all_crtcs() in the test?

Quoted 27 lines
---
 drivers/gpu/drm/i915/intel_crt.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_crt.c +2 -0
index 505fc5cf26f8..4b2dfa1bb00e 100644
@@ -652,6 +652,8 @@ intel_crt_detect(struct drm_connector *connector, bool force)
 		else if (INTEL_INFO(dev)->gen < 4)
 			status = intel_crt_load_detect(crt,
 				to_intel_crtc(connector->state->crtc)->pipe);
+		else if (i915.load_detect_test)
+			status = connector_status_disconnected;
 		else
 			status = connector_status_unknown;
 		intel_release_load_detect_pipe(connector, &tmp, &ctx);
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

Op 01-03-16 om 18:27 schreef Ville Syrjälä:

Quoted 8 lines · Maarten Lankhorst
Quoted 2 lines

This fixes the IGT test, which interprets unknown status as failed to acquire load detect pipe.

Change the expectation of the test?

But more importantly, how can it fail to find a pipe when there's kmstest_unset_all_crtcs() in the test?

It finds a pipe, but because status is connector_status_unknown without this patch it still treats it as failed.

~Maarten
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by
#4 lore raw
Quoted 10 lines · Maarten Lankhorst

Op 01-03-16 om 18:27 schreef Ville Syrjälä:

Quoted 8 lines · Maarten Lankhorst
Quoted 2 lines

This fixes the IGT test, which interprets unknown status as failed to acquire load detect pipe.

Change the expectation of the test?

But more importantly, how can it fail to find a pipe when there's kmstest_unset_all_crtcs() in the test?

It finds a pipe, but because status is connector_status_unknown without this patch it still treats it as failed.

Ah, seems I misunderstand everything today. Yeah that makes sense. We need to distinguish between the failed to get a pipe vs. failed to detect anything even when we found a pipe.

Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx