Skip to contentSkip to conversation

drm/i915: Release connector iterator on a digital port conflict.

PATCH In review Maarten Lankhorst 4 participants 10 messages Feb 15, 2018 – Feb 19, 2018

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

PATCH 1/1 drm/i915: Release connector iterator on a digital port conflict.

<4>[   30.702366] ================================================
<4>[   30.702383] WARNING: lock held when returning to user space!
<4>[   30.702404] 4.16.0-rc1-CI-kasan_1+ #1 Tainted: G        W
<4>[   30.702422] ------------------------------------------------
<4>[   30.702440] kms_3d/1439 is leaving the kernel with locks still held!
<4>[   30.702459] 1 lock held by kms_3d/1439:
<4>[   30.702472]  #0:  (drm_connector_list_iter){.+.+}, at: [<000000003745d183>] intel_atomic_check+0x1d9d/0x3ff0 [i915]
---
 drivers/gpu/drm/i915/intel_display.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +3 -2
index 3eb4c4b2e0e0..9f9656c9cfbe 100644
@@ -10635,6 +10635,7 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state)
 	struct drm_connector_list_iter conn_iter;
 	unsigned int used_ports = 0;
 	unsigned int used_mst_ports = 0;
+	bool ret = true;
 
 	/*
 	 * Walk the connector list instead of the encoder
@@ -10669,7 +10670,7 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state)
 
 			/* the same port mustn't appear more than once */
 			if (used_ports & port_mask)
-				return false;
+				ret = false;
 
 			used_ports |= port_mask;
 			break;
@@ -10687,7 +10688,7 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state)
 	if (used_ports & used_mst_ports)
 		return false;
 
-	return true;
+	return ret;
 }
 
 static void
Signature · 6 lines
2.16.1

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

✗ Fi.CI.CHECKPATCH: warning for drm/i915: Release connector iterator on a digital port conflict.

== Series Details ==

== Series Details ==

Series: drm/i915: Release connector iterator on a digital port conflict.
URL : https://patchwork.freedesktop.org/series/38330/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
fc1e8ae4c756 drm/i915: Release connector iterator on a digital port conflict.
-:13: WARNING: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#13: 
<4>[   30.702472]  #0:  (drm_connector_list_iter){.+.+}, at: [<000000003745d183>] intel_atomic_check+0x1d9d/0x3ff0 [i915]

total: 0 errors, 1 warnings, 0 checks, 23 lines checked

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

Reviewed-by on v1 1/1
#2 lore raw
In reply to Maarten Lankhorst

Quoting Maarten Lankhorst (2018-02-15 09:14:25)

Quoted 10 lines
<4>[   30.702366] ================================================
<4>[   30.702383] WARNING: lock held when returning to user space!
<4>[   30.702404] 4.16.0-rc1-CI-kasan_1+ #1 Tainted: G        W
<4>[   30.702422] ------------------------------------------------
<4>[   30.702440] kms_3d/1439 is leaving the kernel with locks still held!
<4>[   30.702459] 1 lock held by kms_3d/1439:
<4>[   30.702472]  #0:  (drm_connector_list_iter){.+.+}, at: [<000000003745d183>] intel_atomic_check+0x1d9d/0x3ff0 [i915]

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

#3 lore raw

✗ Fi.CI.BAT: failure for drm/i915: Release connector iterator on a digital port conflict.

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: drm/i915: Release connector iterator on a digital port conflict.
URL : https://patchwork.freedesktop.org/series/38330/
State : failure

== Summary ==

Series 38330v1 drm/i915: Release connector iterator on a digital port conflict.
https://patchwork.freedesktop.org/api/1.0/series/38330/revisions/1/mbox/

Test kms_pipe_crc_basic:

        Subgroup suspend-read-crc-pipe-c:
                pass       -> INCOMPLETE (fi-bxt-dsi)
fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:424s
fi-bdw-gvtdvm    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:431s
fi-blb-e6850     total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:382s
fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:498s
fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:289s
fi-bxt-dsi       total:246  pass:219  dwarn:0   dfail:0   fail:0   skip:26 
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:487s
fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:474s
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:464s
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:568s
fi-elk-e7500     total:288  pass:229  dwarn:0   dfail:0   fail:0   skip:59  time:420s
fi-gdg-551       total:288  pass:179  dwarn:0   dfail:0   fail:1   skip:108 time:286s
fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:514s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:395s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:416s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:451s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:459s
fi-kbl-7560u     total:288  pass:269  dwarn:0   dfail:0   fail:0   skip:19  time:500s
fi-kbl-r         total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:501s
fi-pnv-d510      total:288  pass:222  dwarn:1   dfail:0   fail:0   skip:65  time:588s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:432s
fi-skl-6600u     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:504s
fi-skl-6700hq    total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:527s
fi-skl-6700k2    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:494s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:481s
fi-skl-guc       total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:421s
fi-skl-gvtdvm    total:288  pass:265  dwarn:0   dfail:0   fail:0   skip:23  time:434s
fi-snb-2520m     total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:526s
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:398s
Blacklisted hosts:
fi-glk-dsi       total:288  pass:258  dwarn:0   dfail:0   fail:0   skip:30  time:472s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:458s

bd16af128e78b302b3034fa85626cd15dcf5f038 drm-tip: 2018y-02m-15d-00h-22m-40s UTC integration manifest fc1e8ae4c756 drm/i915: Release connector iterator on a digital port conflict.

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8041/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

✗ Fi.CI.CHECKPATCH: warning for drm/i915: Release connector iterator on a digital port conflict.

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: drm/i915: Release connector iterator on a digital port conflict.
URL : https://patchwork.freedesktop.org/series/38330/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
140a43336772 drm/i915: Release connector iterator on a digital port conflict.
-:13: WARNING: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#13: 
<4>[   30.702472]  #0:  (drm_connector_list_iter){.+.+}, at: [<000000003745d183>] intel_atomic_check+0x1d9d/0x3ff0 [i915]

total: 0 errors, 1 warnings, 0 checks, 23 lines checked

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

#5 lore raw

✓ Fi.CI.BAT: success for drm/i915: Release connector iterator on a digital port conflict.

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: drm/i915: Release connector iterator on a digital port conflict.
URL : https://patchwork.freedesktop.org/series/38330/
State : success

== Summary ==

Series 38330v1 drm/i915: Release connector iterator on a digital port conflict.
https://patchwork.freedesktop.org/api/1.0/series/38330/revisions/1/mbox/

Test kms_frontbuffer_tracking:

        Subgroup basic:
                pass       -> FAIL       (fi-glk-1) fdo#103167

fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167

fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:420s
fi-bdw-gvtdvm    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:423s
fi-blb-e6850     total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:374s
fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:490s
fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:287s
fi-bxt-dsi       total:120  pass:108  dwarn:0   dfail:0   fail:0   skip:12 
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:482s
fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:469s
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:459s
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:569s
fi-elk-e7500     total:288  pass:229  dwarn:0   dfail:0   fail:0   skip:59  time:415s
fi-gdg-551       total:288  pass:179  dwarn:0   dfail:0   fail:1   skip:108 time:282s
fi-glk-1         total:288  pass:259  dwarn:0   dfail:0   fail:1   skip:28  time:509s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:390s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:410s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:458s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:457s
fi-kbl-7560u     total:288  pass:269  dwarn:0   dfail:0   fail:0   skip:19  time:494s
fi-kbl-r         total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:504s
fi-pnv-d510      total:288  pass:222  dwarn:1   dfail:0   fail:0   skip:65  time:590s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:423s
fi-skl-6600u     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:504s
fi-skl-6700hq    total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:528s
fi-skl-6700k2    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:490s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:476s
fi-skl-guc       total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:416s
fi-skl-gvtdvm    total:288  pass:265  dwarn:0   dfail:0   fail:0   skip:23  time:429s
fi-snb-2520m     total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:524s
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:395s
Blacklisted hosts:
fi-glk-dsi       total:288  pass:258  dwarn:0   dfail:0   fail:0   skip:30  time:466s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:457s

bd16af128e78b302b3034fa85626cd15dcf5f038 drm-tip: 2018y-02m-15d-00h-22m-40s UTC integration manifest 140a43336772 drm/i915: Release connector iterator on a digital port conflict.

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8044/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw

✗ Fi.CI.IGT: warning for drm/i915: Release connector iterator on a digital port conflict.

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: drm/i915: Release connector iterator on a digital port conflict.
URL : https://patchwork.freedesktop.org/series/38330/
State : warning

== Summary ==

Test perf:

        Subgroup enable-disable:
                fail       -> PASS       (shard-apl) fdo#103715
Test kms_frontbuffer_tracking:
        Subgroup fbc-1p-offscren-pri-indfb-draw-render:
                pass       -> FAIL       (shard-apl) fdo#103167
Test gem_exec_suspend:
        Subgroup basic-s3:
                skip       -> PASS       (shard-snb) fdo#103880
Test kms_cursor_crc:
        Subgroup cursor-256x256-suspend:
                pass       -> SKIP       (shard-snb) fdo#103375
Test kms_draw_crc:
        Subgroup draw-method-rgb565-mmap-gtt-xtiled:
                pass       -> SKIP       (shard-snb)

fdo#103715 https://bugs.freedesktop.org/show_bug.cgi?id=103715
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103880 https://bugs.freedesktop.org/show_bug.cgi?id=103880
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375

shard-apl        total:3342 pass:1728 dwarn:1   dfail:0   fail:20  skip:1592 time:13804s
shard-hsw        total:3427 pass:1759 dwarn:1   dfail:0   fail:10  skip:1656 time:14758s
shard-snb        total:3427 pass:1347 dwarn:1   dfail:0   fail:10  skip:2069 time:7536s

Blacklisted hosts:
shard-kbl total:3427 pass:1906 dwarn:1 dfail:0 fail:22 skip:1498 time:11108s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8041/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#7 lore raw

✓ Fi.CI.IGT: success for drm/i915: Release connector iterator on a digital port conflict.

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: drm/i915: Release connector iterator on a digital port conflict.
URL : https://patchwork.freedesktop.org/series/38330/
State : success

== Summary ==

Test kms_flip:

        Subgroup plain-flip-ts-check-interruptible:
                pass       -> FAIL       (shard-snb) fdo#100368
Test perf_pmu:
        Subgroup semaphore-wait-vcs0:
                pass       -> FAIL       (shard-apl) fdo#105011
Test perf:
        Subgroup enable-disable:
                fail       -> PASS       (shard-apl) fdo#103715
Test gem_eio:
        Subgroup in-flight-suspend:
                pass       -> FAIL       (shard-hsw) fdo#104676
Test kms_cursor_crc:
        Subgroup cursor-256x256-suspend:
                pass       -> SKIP       (shard-snb) fdo#103375
Test gem_exec_suspend:
        Subgroup basic-s3:
                skip       -> PASS       (shard-snb) fdo#103880

fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#105011 https://bugs.freedesktop.org/show_bug.cgi?id=105011
fdo#103715 https://bugs.freedesktop.org/show_bug.cgi?id=103715
fdo#104676 https://bugs.freedesktop.org/show_bug.cgi?id=104676
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#103880 https://bugs.freedesktop.org/show_bug.cgi?id=103880

shard-apl        total:3342 pass:1728 dwarn:1   dfail:0   fail:20  skip:1592 time:13793s
shard-hsw        total:3427 pass:1758 dwarn:1   dfail:0   fail:11  skip:1656 time:14725s
shard-snb        total:3427 pass:1347 dwarn:1   dfail:0   fail:11  skip:2068 time:7543s

Blacklisted hosts:
shard-kbl total:3427 pass:1879 dwarn:29 dfail:1 fail:22 skip:1496 time:11150s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8044/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

maintainer Reviewed-by on v1 1/1
#8 lore raw
In reply to Maarten Lankhorst
Quoted 27 lines · Maarten Lankhorst
<4>[   30.702366] ================================================
<4>[   30.702383] WARNING: lock held when returning to user space!
<4>[   30.702404] 4.16.0-rc1-CI-kasan_1+ #1 Tainted: G        W
<4>[   30.702422] ------------------------------------------------
<4>[   30.702440] kms_3d/1439 is leaving the kernel with locks still held!
<4>[   30.702459] 1 lock held by kms_3d/1439:
<4>[   30.702472]  #0:  (drm_connector_list_iter){.+.+}, at: [<000000003745d183>] intel_atomic_check+0x1d9d/0x3ff0 [i915]
---
 drivers/gpu/drm/i915/intel_display.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -0
index 3eb4c4b2e0e0..9f9656c9cfbe 100644
@@ -10635,6 +10635,7 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state)
 	struct drm_connector_list_iter conn_iter;
 	unsigned int used_ports = 0;
 	unsigned int used_mst_ports = 0;
+	bool ret = true;
 
 	/*
 	 * Walk the connector list instead of the encoder

drivers/gpu/drm/i915/intel_display.c static bool check_digital_port_conflicts(struct drm_atomic_state *state) · line 10671

Quoted 2 lines
drivers/gpu/drm/i915/intel_display.c +0 -0
@@ -10669,7 +10670,7 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state)
 
 			/* the same port mustn't appear more than once */

2 eDPs?!

anyways seems that we do have to end the iteration.

Quoted 22 lines
drivers/gpu/drm/i915/intel_display.c +2 -2
 			if (used_ports & port_mask)
-				return false;
+				ret = false;
 
 			used_ports |= port_mask;
 			break;
@@ -10687,7 +10688,7 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state)
 	if (used_ports & used_mst_ports)
 		return false;
 
-	return true;
+	return ret;
 }
 
 static void
Signature · 6 lines
2.16.1

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

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

#9 lore raw

Op 16-02-18 om 00:38 schreef Rodrigo Vivi:

Quoted 29 lines · Maarten Lankhorst
Quoted 28 lines
<4>[   30.702366] ================================================
<4>[   30.702383] WARNING: lock held when returning to user space!
<4>[   30.702404] 4.16.0-rc1-CI-kasan_1+ #1 Tainted: G        W
<4>[   30.702422] ------------------------------------------------
<4>[   30.702440] kms_3d/1439 is leaving the kernel with locks still held!
<4>[   30.702459] 1 lock held by kms_3d/1439:
<4>[   30.702472]  #0:  (drm_connector_list_iter){.+.+}, at: [<000000003745d183>] intel_atomic_check+0x1d9d/0x3ff0 [i915]
---
 drivers/gpu/drm/i915/intel_display.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -0
index 3eb4c4b2e0e0..9f9656c9cfbe 100644
@@ -10635,6 +10635,7 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state)
 	struct drm_connector_list_iter conn_iter;
 	unsigned int used_ports = 0;
 	unsigned int used_mst_ports = 0;
+	bool ret = true;
 
 	/*
 	 * Walk the connector list instead of the encoder
@@ -10669,7 +10670,7 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state)
 
Quoted 6 lines

drivers/gpu/drm/i915/intel_display.c static bool check_digital_port_conflicts(struct drm_atomic_state *state) · line 10671

Quoted 1 line
drivers/gpu/drm/i915/intel_display.c +0 -0
 			/* the same port mustn't appear more than once */

2 eDPs?!

anyways seems that we do have to end the iteration.

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