Skip to contentSkip to conversation

scripts/trace.pl: Fix context id recycling

PATCH In review Tvrtko Ursulin 3 participants 3 messages Dec 20, 2017

lore
Share & tools
lore

Tvrtko Ursulin

author
#0 lore raw

PATCH 1/1 scripts/trace.pl: Fix context id recycling

From: Tvrtko Ursulin <[email protected]>

Last refactoring introduced a copy and paste error, fix it.

Signed-off-by Tvrtko Ursulin <[email protected]>
Reported-by John Harrison <[email protected]>
Cc John Harrison <[email protected]>
---
 scripts/trace.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/trace.pl +1 -1
index 98e4a9843a43..ade0a9154bd7 100755
@@ -416,7 +416,7 @@ while (<>) {
 
 		if (exists $queue{$key}) {
 			$ctxdb{$orig_ctx}++;
-			$tp{'ctx'} = sanitize_ctx($tp{'ctx'}, $tp{'ring'});
+			$tp{'ctx'} = sanitize_ctx($orig_ctx, $tp{'ring'});
 			$key = db_key($tp{'ring'}, $tp{'ctx'}, $tp{'seqno'});
 		}
Signature · 6 lines
2.14.1

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

✗ Fi.CI.BAT: failure for scripts/trace.pl: Fix context id recycling

== Series Details ==

== Series Details ==

Series: scripts/trace.pl: Fix context id recycling
URL : https://patchwork.freedesktop.org/series/35616/
State : failure

== Summary ==

IGT patchset tested on top of latest successful build
da0889bfacff106fb3ecb7049a7a21f78b4b301b igt/kms_frontbuffer_tracking: Access via GGTT is not guaranteed to be tracked

with latest DRM-Tip kernel build CI_DRM_3552
94dca9e73099 drm-tip: 2017y-12m-20d-09h-26m-52s UTC integration manifest

No testlist changes.

Test debugfs_test:

        Subgroup read_all_entries:
                dmesg-fail -> DMESG-WARN (fi-elk-e7500) fdo#103989
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-a-frame-sequence:
                pass       -> FAIL       (fi-skl-6700k2)
        Subgroup suspend-read-crc-pipe-a:
                dmesg-warn -> PASS       (fi-kbl-r) fdo#104172 +1
Test kms_psr_sink_crc:
        Subgroup psr_basic:
                dmesg-warn -> PASS       (fi-skl-6700hq) fdo#101144

fdo#103989 https://bugs.freedesktop.org/show_bug.cgi?id=103989
fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#104172 https://bugs.freedesktop.org/show_bug.cgi?id=104172
fdo#101144 https://bugs.freedesktop.org/show_bug.cgi?id=101144

fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:437s
fi-bdw-gvtdvm    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:440s
fi-blb-e6850     total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:381s
fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:500s
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:493s
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:498s
fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:483s
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:471s
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:264s
fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:534s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:407s
fi-hsw-4770r     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:415s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:393s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:481s
fi-ivb-3770      total:288  pass:255  dwarn:0   dfail:0   fail:0   skip:33  time:433s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:480s
fi-kbl-7560u     total:288  pass:268  dwarn:1   dfail:0   fail:0   skip:19  time:523s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:473s
fi-kbl-r         total:288  pass:260  dwarn:1   dfail:0   fail:0   skip:27  time:525s
fi-pnv-d510      total:288  pass:222  dwarn:1   dfail:0   fail:0   skip:65  time:580s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:446s
fi-skl-6600u     total:288  pass:260  dwarn:1   dfail:0   fail:0   skip:27  time:537s
fi-skl-6700hq    total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:562s
fi-skl-6700k2    total:288  pass:263  dwarn:0   dfail:0   fail:1   skip:24  time:508s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:499s
fi-skl-gvtdvm    total:288  pass:265  dwarn:0   dfail:0   fail:0   skip:23  time:448s
fi-snb-2520m     total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:553s
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:412s
Blacklisted hosts:
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:586s
fi-cnl-y         total:129  pass:117  dwarn:0   dfail:0   fail:0   skip:11

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_710/issues.html
_______________________________________________
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 Tvrtko Ursulin

Looks good. Or at least, it looks to be the same as it was originally.

Reviewed-by John Harrison <[email protected]>
Quoted 16 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

Last refactoring introduced a copy and paste error, fix it.

Signed-off-by Tvrtko Ursulin <[email protected]>
Reported-by John Harrison <[email protected]>
Cc John Harrison <[email protected]>
---
  scripts/trace.pl | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
scripts/trace.pl +0 -0
index 98e4a9843a43..ade0a9154bd7 100755

scripts/trace.pl while (<>) { · line 422

Quoted 8 lines
scripts/trace.pl +1 -1
@@ -416,7 +416,7 @@ while (<>) {
 
  		if (exists $queue{$key}) {
  			$ctxdb{$orig_ctx}++;
-			$tp{'ctx'} = sanitize_ctx($tp{'ctx'}, $tp{'ring'});
+			$tp{'ctx'} = sanitize_ctx($orig_ctx, $tp{'ring'});
  			$key = db_key($tp{'ring'}, $tp{'ctx'}, $tp{'seqno'});
  		}

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