drm/i915/perf: fix gen11 engine class shift
Subsystems (2)
PATCH 1/1 drm/i915/perf: fix gen11 engine class shift
Use the correct engine class shift value while storing the ctx hw id. Fixes the copy+paste error from commit 61d5676b5561 ("drm/i915/perf: fix ctx_id read with GuC & ICL").
Apologies for not spotting this in the original review, the specific_ctx_id_mask is correct, only the specific_ctx_id had this problem.
--- drivers/gpu/drm/i915/i915_perf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_perf.c +1 -1
@@ -1291,7 +1291,7 @@ static int oa_get_render_ctx_id(struct i915_perf_stream *stream) i915->perf.oa.specific_ctx_id = stream->ctx->hw_id << (GEN11_SW_CTX_ID_SHIFT -32 ) | engine->instance << (GEN11_ENGINE_INSTANCE_SHIFT -32 ) | - engine->class << (GEN11_ENGINE_INSTANCE_SHIFT -32 ); + engine->class << (GEN11_ENGINE_CLASS_SHIFT -32 ); i915->perf.oa.specific_ctx_id_mask = ((1U <<GEN11_SW_CTX_ID_WIDTH ) -1 ) << (GEN11_SW_CTX_ID_SHIFT -32 ) | ((1U << GEN11_ENGINE_INSTANCE_WIDTH) - 1) << (GEN11_ENGINE_INSTANCE_SHIFT - 32) |
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Arg, I'm pretty sure I've run into that same issue before.
Quoted 7 lines · Michel Thierry
Use the correct engine class shift value while storing the ctx hw id. Fixes the copy+paste error from commit
61d5676b5561("drm/i915/perf: fixctx_idread with GuC & ICL").Apologies for not spotting this in the original review, the
specific_ctx_id_maskis correct, only thespecific_ctx_idhad this problem.
Quoted 12 lines
Signed-off-by Michel Thierry <[email protected]>Cc Lionel Landwerlin <[email protected]>Cc Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/i915_perf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/i915_perf.c +0
-0
drivers/gpu/drm/i915/i915_perf.c static int oa_get_render_ctx_id(struct i915_perf_stream *stream) · line 1297
Quoted 8 lines
drivers/gpu/drm/i915/i915_perf.c +1
-1@@ -1291,7 +1291,7 @@ static int oa_get_render_ctx_id(struct i915_perf_stream *stream) i915->perf.oa.specific_ctx_id = stream->ctx->hw_id << (GEN11_SW_CTX_ID_SHIFT -32 ) | engine->instance << (GEN11_ENGINE_INSTANCE_SHIFT -32 ) | - engine->class << (GEN11_ENGINE_INSTANCE_SHIFT -32 ); + engine->class << (GEN11_ENGINE_CLASS_SHIFT -32 ); i915->perf.oa.specific_ctx_id_mask = ((1U <<GEN11_SW_CTX_ID_WIDTH ) -1 ) << (GEN11_SW_CTX_ID_SHIFT -32 ) | ((1U << GEN11_ENGINE_INSTANCE_WIDTH) - 1) << (GEN11_ENGINE_INSTANCE_SHIFT - 32) |
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915/perf: fix gen11 engine class shift
In reply to Michel Thierry== Series Details ==
== Series Details ==
Series: drm/i915/perf: fix gen11 engine class shift
URL : https://patchwork.freedesktop.org/series/44216/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_4277 -> Patchwork_9187 =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_9187 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9187, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/44216/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9187:
=== IGT changes ===
==== Possible regressions ====
igt@gem_exec_suspend@basic-s4-devices:
fi-hsw-peppy: PASS -> FAIL
==== Warnings ====
igt@gem_exec_gttfill@basic:
fi-pnv-d510: SKIP -> PASS== Known issues ==
Here are the changes found in Patchwork_9187 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_flush@basic-uc-prw-default:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#105719)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
fi-cnl-psr: PASS -> DMESG-WARN (fdo#104951)
igt@prime_vgem@basic-fence-flip:
fi-ilk-650: PASS -> FAIL (fdo#104008) fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fdo#104951 https://bugs.freedesktop.org/show_bug.cgi?id=104951
fdo#105719 https://bugs.freedesktop.org/show_bug.cgi?id=105719
== Participating hosts (42 -> 37) ==
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-skl-6700hq fi-hsw-4200u
== Build changes ==
* Linux: CI_DRM_4277 -> Patchwork_9187
CI_DRM_4277: 2309ca0c3ab113e1e760045e230576e0ab4a88e2 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4505: 8a8f0271a71e2e0d2a2caa4d41f4ad1d9c89670e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9187: 41f29e32d8d81a18e54211088ca624462c8b9e70 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
41f29e32d8d8 drm/i915/perf: fix gen11 engine class shift
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9187/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for drm/i915/perf: fix gen11 engine class shift
Quoted 23 lines · Patchwork
== Series Details ==
Series: drm/i915/perf: fix gen11 engine class shift
URL : https://patchwork.freedesktop.org/series/44216/
State : failure== Summary ==
= CI Bug Log - changes from
CI_DRM_4277->Patchwork_9187=== Summary - FAILURE ==
Serious unknown changes coming with
Patchwork_9187absolutely need to be verified manually.If you think the reported changes have nothing to do with the changes introduced in
Patchwork_9187, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.External URL: https://patchwork.freedesktop.org/api/1.0/series/44216/revisions/1/mbox/== Possible new issues ==
Quoted 8 lines
Here are the unknown changes that may have been introduced in Patchwork_9187:
=== IGT changes ===
==== Possible regressions ====
igt@gem_exec_suspend@basic-s4-devices:
fi-hsw-peppy: PASS -> FAILI'm pretty confident the gen11 oa engine class cannot break hsw's s4.
Quoted 45 lines
==== Warnings ==== igt@gem_exec_gttfill@basic: fi-pnv-d510: SKIP -> PASS== Known issues ==
Here are the changes found in Patchwork_9187 that come from known issues: === IGT changes === ==== Issues hit ==== igt@gem_exec_flush@basic-uc-prw-default: fi-glk-j4005: PASS -> DMESG-WARN (fdo#105719) igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c: fi-cnl-psr: PASS -> DMESG-WARN (fdo#104951) igt@prime_vgem@basic-fence-flip: fi-ilk-650: PASS -> FAIL (fdo#104008) fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008 fdo#104951 https://bugs.freedesktop.org/show_bug.cgi?id=104951 fdo#105719 https://bugs.freedesktop.org/show_bug.cgi?id=105719== Participating hosts (42 -> 37) ==
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-skl-6700hq fi-hsw-4200u== Build changes ==
* Linux:
CI_DRM_4277->Patchwork_9187CI_DRM_4277: 2309ca0c3ab113e1e760045e230576e0ab4a88e2 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_4505: 8a8f0271a71e2e0d2a2caa4d41f4ad1d9c89670e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_9187: 41f29e32d8d81a18e54211088ca624462c8b9e70 @ git://anongit.freedesktop.org/gfx-ci/linux
Quoted 8 lines
== Linux commits ==
41f29e32d8d8drm/i915/perf: fix gen11 engine class shift== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9187/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for drm/i915/perf: fix gen11 engine class shift
Quoted 25 lines · Michel Thierry
Quoted 24 lines · Patchwork
== Series Details ==
Series: drm/i915/perf: fix gen11 engine class shift URL : https://patchwork.freedesktop.org/series/44216/
State : failure== Summary ==
= CI Bug Log - changes from
CI_DRM_4277->Patchwork_9187=== Summary - FAILURE ==
Serious unknown changes coming with
Patchwork_9187absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced inPatchwork_9187, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.External URL: https://patchwork.freedesktop.org/api/1.0/series/44216/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in
Patchwork_9187:
Quoted 8 lines
Quoted 6 lines
=== IGT changes ===
==== Possible regressions ====
igt@gem_exec_suspend@basic-s4-devices:
fi-hsw-peppy: PASS -> FAILI'm pretty confident the gen11 oa engine class cannot break hsw's s4.
Yep, the worse that could happen with your patch is a failure on the perf tests.
Quoted 47 lines
Quoted 47 lines
==== Warnings ====
igt@gem_exec_gttfill@basic:
fi-pnv-d510: SKIP -> PASS== Known issues ==
Here are the changes found in
Patchwork_9187that come from known issues:=== IGT changes ===
==== Issues hit ====
igt@gem_exec_flush@basic-uc-prw-default:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#105719)igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
fi-cnl-psr: PASS -> DMESG-WARN (fdo#104951)igt@prime_vgem@basic-fence-flip:
fi-ilk-650: PASS -> FAIL (fdo#104008)fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fdo#104951 https://bugs.freedesktop.org/show_bug.cgi?id=104951
fdo#105719 https://bugs.freedesktop.org/show_bug.cgi?id=105719== Participating hosts (42 -> 37) ==
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-skl-6700hq fi-hsw-4200u
== Build changes ==
* Linux:
CI_DRM_4277->Patchwork_9187
CI_DRM_4277:2309ca0c3ab113e1e760045e230576e0ab4a88e2@git://anongit.freedesktop.org/gfx-ci/linux
IGT_4505:8a8f0271a71e2e0d2a2caa4d41f4ad1d9c89670e@git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9187:41f29e32d8d81a18e54211088ca624462c8b9e70@git://anongit.freedesktop.org/gfx-ci/linux== Linux commits ==
41f29e32d8d8drm/i915/perf: fix gen11 engine class shift
Quoted 8 lines
Quoted 4 lines
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9187/issues.html
_______________________________________________
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
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/perf: fix gen11 engine class shift
In reply to Michel Thierry== Series Details ==
== Series Details ==
Series: drm/i915/perf: fix gen11 engine class shift
URL : https://patchwork.freedesktop.org/series/44216/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4277 -> Patchwork_9188 =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9188 need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9188, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/44216/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9188:
=== IGT changes ===
==== Warnings ====
igt@gem_exec_gttfill@basic:
fi-pnv-d510: SKIP -> PASS== Known issues ==
Here are the changes found in Patchwork_9188 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_chamelium@hdmi-hpd-fast:
fi-kbl-7500u: SKIP -> FAIL (fdo#103841, fdo#102672)
igt@kms_flip@basic-flip-vs-modeset:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#106000)
igt@kms_flip@basic-flip-vs-wf_vblank:
fi-glk-j4005: PASS -> FAIL (fdo#100368)
==== Possible fixes ====
igt@debugfs_test@read_all_entries:
fi-bdw-gvtdvm: DMESG-WARN (fdo#105600) -> PASS +2 fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102672 https://bugs.freedesktop.org/show_bug.cgi?id=102672
fdo#103841 https://bugs.freedesktop.org/show_bug.cgi?id=103841
fdo#105600 https://bugs.freedesktop.org/show_bug.cgi?id=105600
fdo#106000 https://bugs.freedesktop.org/show_bug.cgi?id=106000
== Participating hosts (42 -> 37) ==
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-skl-6700hq fi-hsw-4200u
== Build changes ==
* Linux: CI_DRM_4277 -> Patchwork_9188
CI_DRM_4277: 2309ca0c3ab113e1e760045e230576e0ab4a88e2 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4505: 8a8f0271a71e2e0d2a2caa4d41f4ad1d9c89670e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9188: f995a2b13ba90f6509972a9296edc9b5de18951d @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
f995a2b13ba9 drm/i915/perf: fix gen11 engine class shift
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9188/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Michel Thierry (2018-06-04 19:17:24)
Quoted 20 lines
Use the correct engine class shift value while storing the ctx hw id. Fixes the copy+paste error from commit
61d5676b5561("drm/i915/perf: fixctx_idread with GuC & ICL").Apologies for not spotting this in the original review, the
specific_ctx_id_maskis correct, only thespecific_ctx_idhad this problem.Signed-off-by Michel Thierry <[email protected]>Cc Lionel Landwerlin <[email protected]>Cc Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/i915_perf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/i915_perf.c +0
-0
drivers/gpu/drm/i915/i915_perf.c static int oa_get_render_ctx_id(struct i915_perf_stream *stream) · line 1294
Quoted 5 lines
drivers/gpu/drm/i915/i915_perf.c +1
-1@@ -1291,7 +1291,7 @@ static int oa_get_render_ctx_id(struct i915_perf_stream *stream) i915->perf.oa.specific_ctx_id = stream->ctx->hw_id << (GEN11_SW_CTX_ID_SHIFT -32 ) | engine->instance << (GEN11_ENGINE_INSTANCE_SHIFT -32 ) | - engine->class << (GEN11_ENGINE_INSTANCE_SHIFT -32 ); + engine->class << (GEN11_ENGINE_CLASS_SHIFT -32 );
Hmm, isn't this upper_32_bits(ce->lrc_desc) ?
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 16 lines · Chris Wilson
Quoting Michel Thierry (2018-06-04 19:17:24)
Quoted 15 lines
Use the correct engine class shift value while storing the ctx hw id. Fixes the copy+paste error from commit
61d5676b5561("drm/i915/perf: fixctx_idread with GuC & ICL").Apologies for not spotting this in the original review, the
specific_ctx_id_maskis correct, only thespecific_ctx_idhad this problem.Signed-off-by Michel Thierry <[email protected]>Cc Lionel Landwerlin <[email protected]>Cc Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/i915_perf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 12 lines
drivers/gpu/drm/i915/i915_perf.c static int oa_get_render_ctx_id(struct i915_perf_stream *stream) · line 1294
Quoted 10 lines
drivers/gpu/drm/i915/i915_perf.c +1
-1@@ -1291,7 +1291,7 @@ static int oa_get_render_ctx_id(struct i915_perf_stream *stream) i915->perf.oa.specific_ctx_id = stream->ctx->hw_id << (GEN11_SW_CTX_ID_SHIFT -32 ) | engine->instance << (GEN11_ENGINE_INSTANCE_SHIFT -32 ) | - engine->class << (GEN11_ENGINE_INSTANCE_SHIFT -32 ); + engine->class << (GEN11_ENGINE_CLASS_SHIFT -32 );Hmm, isn't this
upper_32_bits(ce->lrc_desc)?
True, it is (and since the lrc_desc is already available, we can argue it is also true for !guc in Gen8-10).
I'll change it.
Thanks,
-Michel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for drm/i915/perf: fix gen11 engine class shift
In reply to Michel Thierry== Series Details ==
== Series Details ==
Series: drm/i915/perf: fix gen11 engine class shift
URL : https://patchwork.freedesktop.org/series/44216/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_4277_full -> Patchwork_9188_full =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_9188_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9188_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/44216/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9188_full:
=== IGT changes ===
==== Possible regressions ====
igt@drv_selftest@live_hangcheck:
shard-hsw: PASS -> DMESG-FAIL
==== Warnings ====
igt@gem_exec_schedule@deep-bsd1:
shard-kbl: PASS -> SKIP +3
igt@gem_exec_schedule@deep-bsd2:
shard-kbl: SKIP -> PASS== Known issues ==
Here are the changes found in Patchwork_9188_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_atomic_transition@1x-modeset-transitions-nonblocking:
shard-glk: PASS -> FAIL (fdo#105703)
igt@kms_flip@2x-dpms-vs-vblank-race:
shard-hsw: PASS -> FAIL (fdo#103060)
igt@kms_flip@plain-flip-ts-check:
shard-glk: PASS -> FAIL (fdo#100368)
igt@kms_flip_tiling@flip-to-y-tiled:
shard-glk: PASS -> FAIL (fdo#103822, fdo#104724)
==== Possible fixes ====
igt@drv_selftest@live_gtt:
shard-apl: INCOMPLETE (fdo#103927) -> PASS
igt@gem_eio@hibernate:
shard-snb: INCOMPLETE (fdo#105411) -> PASS
igt@kms_flip@2x-plain-flip-ts-check:
shard-hsw: FAIL (fdo#100368) -> PASS
shard-glk: FAIL (fdo#100368) -> PASS
igt@kms_flip@flip-vs-expired-vblank-interruptible:
shard-glk: FAIL (fdo#105363, fdo#102887) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#105703 https://bugs.freedesktop.org/show_bug.cgi?id=105703
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4277 -> Patchwork_9188
CI_DRM_4277: 2309ca0c3ab113e1e760045e230576e0ab4a88e2 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4505: 8a8f0271a71e2e0d2a2caa4d41f4ad1d9c89670e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9188: f995a2b13ba90f6509972a9296edc9b5de18951d @ git://anongit.freedesktop.org/gfx-ci/linux
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9188/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx