diff mbox

[CI] drm/i915: properly init lockdep class

Message ID 20171214131009.7479-1-joonas.lahtinen@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Joonas Lahtinen Dec. 14, 2017, 1:10 p.m. UTC 
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

The code has an ifdef and uses two functions to either init the bare
spinlock or init it and set a lock-class. It is possible to do the same
thing without an ifdef.
With this patch (in debug case) we first use the "default" lock class
which is later overwritten to the supplied one. Without lockdep the set
name/class function vanishes.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_gem_timeline.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Joonas Lahtinen Dec. 14, 2017, 1:39 p.m. UTC | #1 
On Thu, 2017-12-14 at 13:29 +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915: properly init lockdep class (rev2)
> URL   : https://patchwork.freedesktop.org/series/34693/
> State : failure
> 
> == Summary ==
> 
> Series 34693v2 drm/i915: properly init lockdep class
> https://patchwork.freedesktop.org/api/1.0/series/34693/revisions/2/mbox/
> 
> Test debugfs_test:
>         Subgroup read_all_entries:
>                 dmesg-warn -> PASS       (fi-elk-e7500) fdo#103989 +2
> Test gem_mmap_gtt:
>         Subgroup basic-small-bo-tiledx:
>                 pass       -> FAIL       (fi-gdg-551) fdo#102575
> Test kms_pipe_crc_basic:
>         Subgroup read-crc-pipe-c-frame-sequence:
>                 pass       -> FAIL       (fi-hsw-4770r)

This doesn't seem like a related error, I'll queue a rerun for the
patch to get it to the full run.

Regards, Joonas

> 
> fdo#103989 https://bugs.freedesktop.org/show_bug.cgi?id=103989
> fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
> 
> fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:434s
> fi-blb-e6850     total:288  pass:222  dwarn:1   dfail:1   fail:0   skip:64  time:389s
> fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:499s
> fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:277s
> fi-bxt-dsi       total:288  pass:258  dwarn:0   dfail:0   fail:0   skip:30  time:496s
> fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:500s
> fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:478s
> fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:470s
> fi-elk-e7500     total:224  pass:163  dwarn:15  dfail:0   fail:0   skip:45 
> fi-gdg-551       total:288  pass:178  dwarn:1   dfail:0   fail:1   skip:108 time:263s
> fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:526s
> fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:403s
> fi-hsw-4770r     total:288  pass:260  dwarn:0   dfail:0   fail:1   skip:27  time:414s
> fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:388s
> fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:468s
> fi-ivb-3770      total:288  pass:255  dwarn:0   dfail:0   fail:0   skip:33  time:422s
> fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:479s
> fi-kbl-7560u     total:288  pass:268  dwarn:1   dfail:0   fail:0   skip:19  time:520s
> fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:467s
> fi-kbl-r         total:288  pass:260  dwarn:1   dfail:0   fail:0   skip:27  time:522s
> fi-pnv-d510      total:288  pass:221  dwarn:1   dfail:0   fail:1   skip:65  time:585s
> fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:452s
> fi-skl-6600u     total:288  pass:260  dwarn:1   dfail:0   fail:0   skip:27  time:536s
> fi-skl-6700hq    total:288  pass:261  dwarn:1   dfail:0   fail:0   skip:26  time:555s
> fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:489s
> fi-skl-gvtdvm    total:288  pass:265  dwarn:0   dfail:0   fail:0   skip:23  time:445s
> fi-snb-2520m     total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:546s
> fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:410s
> Blacklisted hosts:
> fi-cfl-s2        total:288  pass:261  dwarn:1   dfail:0   fail:0   skip:26  time:594s
> fi-cnl-y         total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:619s
> 
> 91d06d0bbd1a91f430350dbc24e05c37303b25b9 drm-tip: 2017y-12m-14d-09h-49m-51s UTC integration manifest
> bea6424fd138 drm/i915: properly init lockdep class
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7495/issues.html
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen Dec. 14, 2017, 6:11 p.m. UTC | #2 
On Thu, 2017-12-14 at 16:37 +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915: properly init lockdep class (rev2)
> URL   : https://patchwork.freedesktop.org/series/34693/
> State : success

Passed the CI and merged, thanks for the patch!

Regards, Joonas

> 
> == Summary ==
> 
> Test gem_eio:
>         Subgroup suspend:
>                 fail       -> PASS       (shard-hsw) fdo#103990
> Test gem_softpin:
>         Subgroup noreloc-s3:
>                 incomplete -> PASS       (shard-hsw) fdo#103540
> Test kms_cursor_crc:
>         Subgroup cursor-128x128-suspend:
>                 skip       -> PASS       (shard-snb) fdo#103375 +1
> Test perf:
>         Subgroup polling:
>                 fail       -> PASS       (shard-hsw) fdo#102252
> Test gem_tiled_swapping:
>         Subgroup non-threaded:
>                 dmesg-warn -> PASS       (shard-hsw) fdo#104218 +1
> Test kms_flip:
>         Subgroup modeset-vs-vblank-race:
>                 fail       -> PASS       (shard-hsw) fdo#103060
> 
> fdo#103990 https://bugs.freedesktop.org/show_bug.cgi?id=103990
> fdo#103540 https://bugs.freedesktop.org/show_bug.cgi?id=103540
> fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
> fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
> fdo#104218 https://bugs.freedesktop.org/show_bug.cgi?id=104218
> fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
> 
> shard-hsw        total:2712 pass:1536 dwarn:1   dfail:0   fail:10  skip:1165 time:9359s
> shard-snb        total:2712 pass:1309 dwarn:1   dfail:0   fail:11  skip:1391 time:8017s
> Blacklisted hosts:
> shard-apl        total:2712 pass:1683 dwarn:1   dfail:0   fail:27  skip:1001 time:13864s
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7496/shards.html
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_gem_timeline.c b/drivers/gpu/drm/i915/i915_gem_timeline.c
index c01905d6450c..e9fd87604067 100644
--- a/drivers/gpu/drm/i915/i915_gem_timeline.c
+++ b/drivers/gpu/drm/i915/i915_gem_timeline.c
@@ -33,11 +33,8 @@  static void __intel_timeline_init(struct intel_timeline *tl,
 {
 	tl->fence_context = context;
 	tl->common = parent;
-#ifdef CONFIG_DEBUG_SPINLOCK
-	__raw_spin_lock_init(&tl->lock.rlock, lockname, lockclass);
-#else
 	spin_lock_init(&tl->lock);
-#endif
+	lockdep_set_class_and_name(&tl->lock, lockclass, lockname);
 	init_request_active(&tl->last_request, NULL);
 	INIT_LIST_HEAD(&tl->requests);
 	i915_syncmap_init(&tl->sync);