Pass device pointer to the selftest wrapper macros, so we can use device context in message printing.
If the caller chooses not to pass a device, use old style formatting instead of embedding NULL device into the messages. Assisted-by: GitHub-Copilot:claude-opus-5 Signed-off-by: Krzysztof Karas <[email protected]> --- .../gpu/drm/i915/gem/selftests/huge_pages.c | 4 +- .../i915/gem/selftests/i915_gem_client_blt.c | 2 +- .../i915/gem/selftests/i915_gem_coherency.c | 2 +- .../drm/i915/gem/selftests/i915_gem_context.c | 2 +- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 4 +- .../drm/i915/gem/selftests/i915_gem_migrate.c | 2 +- .../drm/i915/gem/selftests/i915_gem_mman.c | 4 +- .../drm/i915/gem/selftests/i915_gem_object.c | 4 +- .../drm/i915/gem/selftests/i915_gem_phys.c | 2 +- drivers/gpu/drm/i915/gt/selftest_context.c | 2 +- drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 4 +- .../drm/i915/gt/selftest_engine_heartbeat.c | 2 +- drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 2 +- drivers/gpu/drm/i915/gt/selftest_execlists.c | 2 +- drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 4 +- drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 2 +- drivers/gpu/drm/i915/gt/selftest_lrc.c | 2 +- drivers/gpu/drm/i915/gt/selftest_migrate.c | 4 +- drivers/gpu/drm/i915/gt/selftest_mocs.c | 2 +- drivers/gpu/drm/i915/gt/selftest_reset.c | 2 +- drivers/gpu/drm/i915/gt/selftest_ring.c | 2 +- .../drm/i915/gt/selftest_ring_submission.c | 2 +- drivers/gpu/drm/i915/gt/selftest_slpc.c | 2 +- drivers/gpu/drm/i915/gt/selftest_timeline.c | 4 +- drivers/gpu/drm/i915/gt/selftest_tlb.c | 2 +- .../gpu/drm/i915/gt/selftest_workarounds.c | 2 +- drivers/gpu/drm/i915/gt/st_shmem_utils.c | 2 +- drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 2 +- .../drm/i915/gt/uc/selftest_guc_hangcheck.c | 2 +- .../drm/i915/gt/uc/selftest_guc_multi_lrc.c | 2 +- drivers/gpu/drm/i915/i915_selftest.h | 16 ++--- drivers/gpu/drm/i915/selftests/i915_active.c | 2 +- drivers/gpu/drm/i915/selftests/i915_gem.c | 2 +- .../gpu/drm/i915/selftests/i915_gem_evict.c | 4 +- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +- drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +- drivers/gpu/drm/i915/selftests/i915_request.c | 6 +- .../gpu/drm/i915/selftests/i915_selftest.c | 63 ++++++++++++++----- .../gpu/drm/i915/selftests/i915_sw_fence.c | 2 +- drivers/gpu/drm/i915/selftests/i915_syncmap.c | 2 +- drivers/gpu/drm/i915/selftests/i915_vma.c | 4 +- .../drm/i915/selftests/intel_memory_region.c | 6 +- drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 +- drivers/gpu/drm/i915/selftests/scatterlist.c | 2 +- 44 files changed, 113 insertions(+), 80 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c index 44718e728291..50199faf0a0e 100644 --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c @@ -1991,7 +1991,7 @@ int i915_gem_huge_page_mock_selftests(void) goto out_put; } - err = i915_subtests(tests, ppgtt); + err = i915_subtests(tests, ppgtt, &i915->drm); out_put: i915_vm_put(&ppgtt->vm); @@ -2021,5 +2021,5 @@ int i915_gem_huge_page_live_selftests(struct drm_i915_private *i915) if (intel_gt_is_wedged(to_gt(i915))) return 0; - return i915_live_subtests(tests, i915); + return i915_live_subtests(tests, i915, &i915->drm); } diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c index 1d4d7cfb3f9c..48ac2b7d80df 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c @@ -742,5 +742,5 @@ int i915_gem_client_blt_live_selftests(struct drm_i915_private *i915) if (intel_gt_is_wedged(to_gt(i915))) return 0; - return i915_live_subtests(tests, i915); + return i915_live_subtests(tests, i915, &i915->drm); } diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c index 2a0c0634d446..316bab3d86ab 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c @@ -430,5 +430,5 @@ int i915_gem_coherency_live_selftests(struct drm_i915_private *i915) SUBTEST(igt_gem_coherency), }; - return i915_live_subtests(tests, i915); + return i915_live_subtests(tests, i915, &i915->drm); } diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c index 9d405098f9e7..f85f4b8b1ef3 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c @@ -1912,5 +1912,5 @@ int i915_gem_context_live_selftests(struct drm_i915_private *i915) if (intel_gt_is_wedged(to_gt(i915))) return 0; - return i915_live_subtests(tests, i915); + return i915_live_subtests(tests, i915, &i915->drm); } diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c index 2fda549dd82d..a1c611d287c8 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c @@ -541,7 +541,7 @@ int i915_gem_dmabuf_mock_selftests(void) if (!i915) return -ENOMEM; - err = i915_subtests(tests, i915); + err = i915_subtests(tests, i915, &i915->drm); mock_destroy_device(i915); return err; @@ -556,5 +556,5 @@ int i915_gem_dmabuf_live_selftests(struct drm_i915_private *i915) SUBTEST(igt_dmabuf_import_same_driver_lmem_smem), }; - return i915_live_subtests(tests, i915); + return i915_live_subtests(tests, i915, &i915->drm); } diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c index d8f4a10d71de..553bf14f8274 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c @@ -524,5 +524,5 @@ int i915_gem_migrate_live_selftests(struct drm_i915_private *i915) if (!HAS_LMEM(i915)) return 0; - return intel_gt_live_subtests(tests, to_gt(i915)); + return intel_gt_live_subtests(tests, to_gt(i915), &i915->drm); } diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c index d01acfb7d93d..a15bdec2177b 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c @@ -1860,12 +1860,12 @@ int i915_gem_mman_live_selftests(struct drm_i915_private *i915) SUBTEST(igt_mmap_gpu), }; - ret = i915_live_subtests(tests, i915); + ret = i915_live_subtests(tests, i915, &i915->drm); if (ret) return ret; if (current->mm) - ret = i915_live_subtests(vma_tests, i915); + ret = i915_live_subtests(vma_tests, i915, &i915->drm); else pr_warn("No current->mm to safely borrow userspace memory from. Skipping VMA tests.\n"); diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_object.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_object.c index 19e374f68ff7..4317e6a5362e 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_object.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_object.c @@ -83,7 +83,7 @@ int i915_gem_object_mock_selftests(void) if (!i915) return -ENOMEM; - err = i915_subtests(tests, i915); + err = i915_subtests(tests, i915, &i915->drm); mock_destroy_device(i915); return err; @@ -95,5 +95,5 @@ int i915_gem_object_live_selftests(struct drm_i915_private *i915) SUBTEST(igt_gem_huge), }; - return i915_live_subtests(tests, i915); + return i915_live_subtests(tests, i915, &i915->drm); } diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_phys.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_phys.c index d43d8dae0f69..9c05e8db3861 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_phys.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_phys.c @@ -80,7 +80,7 @@ int i915_gem_phys_mock_selftests(void) if (!i915) return -ENOMEM; - err = i915_subtests(tests, i915); + err = i915_subtests(tests, i915, &i915->drm); mock_destroy_device(i915); return err; diff --git a/drivers/gpu/drm/i915/gt/selftest_context.c b/drivers/gpu/drm/i915/gt/selftest_context.c index d9d279991eda..e02eb41205a5 100644 --- a/drivers/gpu/drm/i915/gt/selftest_context.c +++ b/drivers/gpu/drm/i915/gt/selftest_context.c @@ -458,5 +458,5 @@ int intel_context_live_selftests(struct drm_i915_private *i915) if (intel_gt_is_wedged(gt)) return 0; - return intel_gt_live_subtests(tests, gt); + return intel_gt_live_subtests(tests, gt, &i915->drm); } diff --git a/drivers/gpu/drm/i915/gt/selftest_engine_cs.c b/drivers/gpu/drm/i915/gt/selftest_engine_cs.c index 28c019547b34..88f8ee5efa42 100644 --- a/drivers/gpu/drm/i915/gt/selftest_engine_cs.c +++ b/drivers/gpu/drm/i915/gt/selftest_engine_cs.c @@ -384,7 +384,7 @@ int intel_engine_cs_perf_selftests(struct drm_i915_private *i915) if (intel_gt_is_wedged(to_gt(i915))) return 0; - return intel_gt_live_subtests(tests, to_gt(i915)); + return intel_gt_live_subtests(tests, to_gt(i915), &i915->drm); } static int intel_mmio_bases_check(void *arg) @@ -439,5 +439,5 @@ int intel_engine_cs_mock_selftests(void) SUBTEST(intel_mmio_bases_check), }; - return i915_subtests(tests, NULL); + return i915_subtests(tests, NULL, NULL); } diff --git a/drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c b/drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c index d26441ee837b..3d22f1f85f95 100644 --- a/drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c +++ b/drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c @@ -275,7 +275,7 @@ int intel_heartbeat_live_selftests(struct drm_i915_private *i915) saved_hangcheck = i915->params.enable_hangcheck; i915->params.enable_hangcheck = INT_MAX; - err = intel_gt_live_subtests(tests, to_gt(i915)); + err = intel_gt_live_subtests(tests, to_gt(i915), &i915->drm); i915->params.enable_hangcheck = saved_hangcheck; return err; diff --git a/drivers/gpu/drm/i915/gt/selftest_engine_pm.c b/drivers/gpu/drm/i915/gt/selftest_engine_pm.c index 2813f0c717a9..acf3ae1da919 100644 --- a/drivers/gpu/drm/i915/gt/selftest_engine_pm.c +++ b/drivers/gpu/drm/i915/gt/selftest_engine_pm.c @@ -434,5 +434,5 @@ int live_engine_pm_selftests(struct intel_gt *gt) SUBTEST(live_engine_pm), }; - return intel_gt_live_subtests(tests, gt); + return intel_gt_live_subtests(tests, gt, >->i915->drm); } diff --git a/drivers/gpu/drm/i915/gt/selftest_execlists.c b/drivers/gpu/drm/i915/gt/selftest_execlists.c index 97dc44cf615f..6764d8284d6c 100644 --- a/drivers/gpu/drm/i915/gt/selftest_execlists.c +++ b/drivers/gpu/drm/i915/gt/selftest_execlists.c @@ -4573,5 +4573,5 @@ int intel_execlists_live_selftests(struct drm_i915_private *i915) if (intel_gt_is_wedged(to_gt(i915))) return 0; - return intel_gt_live_subtests(tests, to_gt(i915)); + return intel_gt_live_subtests(tests, to_gt(i915), &i915->drm); } diff --git a/drivers/gpu/drm/i915/gt/selftest_gt_pm.c b/drivers/gpu/drm/i915/gt/selftest_gt_pm.c index 4e583fcb1cf9..534012012c34 100644 --- a/drivers/gpu/drm/i915/gt/selftest_gt_pm.c +++ b/drivers/gpu/drm/i915/gt/selftest_gt_pm.c @@ -202,7 +202,7 @@ int intel_gt_pm_live_selftests(struct drm_i915_private *i915) if (intel_gt_is_wedged(to_gt(i915))) return 0; - return intel_gt_live_subtests(tests, to_gt(i915)); + return intel_gt_live_subtests(tests, to_gt(i915), &i915->drm); } int intel_gt_pm_late_selftests(struct drm_i915_private *i915) @@ -219,5 +219,5 @@ int intel_gt_pm_late_selftests(struct drm_i915_private *i915) if (intel_gt_is_wedged(to_gt(i915))) return 0; - return intel_gt_live_subtests(tests, to_gt(i915)); + return intel_gt_live_subtests(tests, to_gt(i915), &i915->drm); } diff --git a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c index 00dfc37221fa..3234d88a611a 100644 --- a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c +++ b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c @@ -2028,7 +2028,7 @@ int intel_hangcheck_live_selftests(struct drm_i915_private *i915) wakeref = intel_runtime_pm_get(gt->uncore->rpm); - err = intel_gt_live_subtests(tests, gt); + err = intel_gt_live_subtests(tests, gt, &i915->drm); intel_runtime_pm_put(gt->uncore->rpm, wakeref); diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c index 23f04f6f8fba..0e8c9626ee56 100644 --- a/drivers/gpu/drm/i915/gt/selftest_lrc.c +++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c @@ -1990,5 +1990,5 @@ int intel_lrc_live_selftests(struct drm_i915_private *i915) if (!HAS_LOGICAL_RING_CONTEXTS(i915)) return 0; - return intel_gt_live_subtests(tests, to_gt(i915)); + return intel_gt_live_subtests(tests, to_gt(i915), &i915->drm); } diff --git a/drivers/gpu/drm/i915/gt/selftest_migrate.c b/drivers/gpu/drm/i915/gt/selftest_migrate.c index fb348aa82e05..321ca87b7d06 100644 --- a/drivers/gpu/drm/i915/gt/selftest_migrate.c +++ b/drivers/gpu/drm/i915/gt/selftest_migrate.c @@ -824,7 +824,7 @@ int intel_migrate_live_selftests(struct drm_i915_private *i915) if (!gt->migrate.context) return 0; - return intel_gt_live_subtests(tests, gt); + return intel_gt_live_subtests(tests, gt, &i915->drm); } static struct drm_i915_gem_object * @@ -1046,5 +1046,5 @@ int intel_migrate_perf_selftests(struct drm_i915_private *i915) if (!gt->migrate.context) return 0; - return intel_gt_live_subtests(tests, gt); + return intel_gt_live_subtests(tests, gt, &i915->drm); } diff --git a/drivers/gpu/drm/i915/gt/selftest_mocs.c b/drivers/gpu/drm/i915/gt/selftest_mocs.c index 770516c6c7da..6b927e7d6c21 100644 --- a/drivers/gpu/drm/i915/gt/selftest_mocs.c +++ b/drivers/gpu/drm/i915/gt/selftest_mocs.c @@ -453,5 +453,5 @@ int intel_mocs_live_selftests(struct drm_i915_private *i915) if (!get_mocs_settings(i915, &table)) return 0; - return intel_gt_live_subtests(tests, to_gt(i915)); + return intel_gt_live_subtests(tests, to_gt(i915), &i915->drm); } diff --git a/drivers/gpu/drm/i915/gt/selftest_reset.c b/drivers/gpu/drm/i915/gt/selftest_reset.c index 938218e0d5bc..02acac8cd04c 100644 --- a/drivers/gpu/drm/i915/gt/selftest_reset.c +++ b/drivers/gpu/drm/i915/gt/selftest_reset.c @@ -398,5 +398,5 @@ int intel_reset_live_selftests(struct drm_i915_private *i915) if (intel_gt_is_wedged(gt)) return -EIO; /* we're long past hope of a successful reset */ - return intel_gt_live_subtests(tests, gt); + return intel_gt_live_subtests(tests, gt, &i915->drm); } diff --git a/drivers/gpu/drm/i915/gt/selftest_ring.c b/drivers/gpu/drm/i915/gt/selftest_ring.c index 2a8c534dc125..97ffcaadd412 100644 --- a/drivers/gpu/drm/i915/gt/selftest_ring.c +++ b/drivers/gpu/drm/i915/gt/selftest_ring.c @@ -106,5 +106,5 @@ int intel_ring_mock_selftests(void) SUBTEST(igt_ring_direction), }; - return i915_subtests(tests, NULL); + return i915_subtests(tests, NULL, NULL); } diff --git a/drivers/gpu/drm/i915/gt/selftest_ring_submission.c b/drivers/gpu/drm/i915/gt/selftest_ring_submission.c index 600333ae6c8c..1234b74ee407 100644 --- a/drivers/gpu/drm/i915/gt/selftest_ring_submission.c +++ b/drivers/gpu/drm/i915/gt/selftest_ring_submission.c @@ -295,5 +295,5 @@ int intel_ring_submission_live_selftests(struct drm_i915_private *i915) if (to_gt(i915)->submission_method > INTEL_SUBMISSION_RING) return 0; - return intel_gt_live_subtests(tests, to_gt(i915)); + return intel_gt_live_subtests(tests, to_gt(i915), &i915->drm); } diff --git a/drivers/gpu/drm/i915/gt/selftest_slpc.c b/drivers/gpu/drm/i915/gt/selftest_slpc.c index 531dbc08c8c3..c8096c7c628e 100644 --- a/drivers/gpu/drm/i915/gt/selftest_slpc.c +++ b/drivers/gpu/drm/i915/gt/selftest_slpc.c @@ -584,5 +584,5 @@ int intel_slpc_live_selftests(struct drm_i915_private *i915) return 0; } - return i915_live_subtests(tests, i915); + return i915_live_subtests(tests, i915, &i915->drm); } diff --git a/drivers/gpu/drm/i915/gt/selftest_timeline.c b/drivers/gpu/drm/i915/gt/selftest_timeline.c index 29d860a5c9c8..bd9d39cfdffe 100644 --- a/drivers/gpu/drm/i915/gt/selftest_timeline.c +++ b/drivers/gpu/drm/i915/gt/selftest_timeline.c @@ -448,7 +448,7 @@ int intel_timeline_mock_selftests(void) SUBTEST(bench_sync), }; - return i915_subtests(tests, NULL); + return i915_subtests(tests, NULL, NULL); } static int emit_ggtt_store_dw(struct i915_request *rq, u32 addr, u32 value) @@ -1425,5 +1425,5 @@ int intel_timeline_live_selftests(struct drm_i915_private *i915) if (intel_gt_is_wedged(to_gt(i915))) return 0; - return intel_gt_live_subtests(tests, to_gt(i915)); + return intel_gt_live_subtests(tests, to_gt(i915), &i915->drm); } diff --git a/drivers/gpu/drm/i915/gt/selftest_tlb.c b/drivers/gpu/drm/i915/gt/selftest_tlb.c index 89420f07f681..e81567067991 100644 --- a/drivers/gpu/drm/i915/gt/selftest_tlb.c +++ b/drivers/gpu/drm/i915/gt/selftest_tlb.c @@ -405,7 +405,7 @@ int intel_tlb_live_selftests(struct drm_i915_private *i915) if (intel_gt_is_wedged(gt)) continue; - err = intel_gt_live_subtests(tests, gt); + err = intel_gt_live_subtests(tests, gt, &i915->drm); if (err) return err; } diff --git a/drivers/gpu/drm/i915/gt/selftest_workarounds.c b/drivers/gpu/drm/i915/gt/selftest_workarounds.c index 8b74d62e7ca5..460233fdb333 100644 --- a/drivers/gpu/drm/i915/gt/selftest_workarounds.c +++ b/drivers/gpu/drm/i915/gt/selftest_workarounds.c @@ -1404,5 +1404,5 @@ int intel_workarounds_live_selftests(struct drm_i915_private *i915) if (intel_gt_is_wedged(to_gt(i915))) return 0; - return intel_gt_live_subtests(tests, to_gt(i915)); + return intel_gt_live_subtests(tests, to_gt(i915), &i915->drm); } diff --git a/drivers/gpu/drm/i915/gt/st_shmem_utils.c b/drivers/gpu/drm/i915/gt/st_shmem_utils.c index b279fe88b70e..b00e29737c11 100644 --- a/drivers/gpu/drm/i915/gt/st_shmem_utils.c +++ b/drivers/gpu/drm/i915/gt/st_shmem_utils.c @@ -59,5 +59,5 @@ int shmem_utils_mock_selftests(void) SUBTEST(igt_shmem_basic), }; - return i915_subtests(tests, NULL); + return i915_subtests(tests, NULL, NULL); } diff --git a/drivers/gpu/drm/i915/gt/uc/selftest_guc.c b/drivers/gpu/drm/i915/gt/uc/selftest_guc.c index 63a75272924f..e201410c2e2c 100644 --- a/drivers/gpu/drm/i915/gt/uc/selftest_guc.c +++ b/drivers/gpu/drm/i915/gt/uc/selftest_guc.c @@ -415,5 +415,5 @@ int intel_guc_live_selftests(struct drm_i915_private *i915) if (!intel_uc_uses_guc_submission(>->uc)) return 0; - return intel_gt_live_subtests(tests, gt); + return intel_gt_live_subtests(tests, gt, &i915->drm); } diff --git a/drivers/gpu/drm/i915/gt/uc/selftest_guc_hangcheck.c b/drivers/gpu/drm/i915/gt/uc/selftest_guc_hangcheck.c index 83801c992488..bcce2afaa4f7 100644 --- a/drivers/gpu/drm/i915/gt/uc/selftest_guc_hangcheck.c +++ b/drivers/gpu/drm/i915/gt/uc/selftest_guc_hangcheck.c @@ -158,5 +158,5 @@ int intel_guc_hang_check(struct drm_i915_private *i915) if (!intel_uc_uses_guc_submission(>->uc)) return 0; - return intel_gt_live_subtests(tests, gt); + return intel_gt_live_subtests(tests, gt, &i915->drm); } diff --git a/drivers/gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c b/drivers/gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c index 18077801b2e6..89a1ad08ddb0 100644 --- a/drivers/gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c +++ b/drivers/gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c @@ -180,5 +180,5 @@ int intel_guc_multi_lrc_live_selftests(struct drm_i915_private *i915) if (!intel_uc_uses_guc_submission(>->uc)) return 0; - return intel_gt_live_subtests(tests, gt); + return intel_gt_live_subtests(tests, gt, &i915->drm); } diff --git a/drivers/gpu/drm/i915/i915_selftest.h b/drivers/gpu/drm/i915/i915_selftest.h index e29ca298e7eb..f102d61bfa3b 100644 --- a/drivers/gpu/drm/i915/i915_selftest.h +++ b/drivers/gpu/drm/i915/i915_selftest.h @@ -29,6 +29,7 @@ #define STACK_MAGIC 0xdeadbeef struct pci_dev; +struct drm_device; struct drm_i915_private; struct i915_selftest { @@ -88,24 +89,25 @@ int __i915_subtests(const char *caller, int (*teardown)(int err, void *data), const struct i915_subtest *st, unsigned int count, - void *data); -#define i915_subtests(T, data) \ + void *data, + struct drm_device *device); +#define i915_subtests(T, data, device) \ __i915_subtests(__func__, \ __i915_nop_setup, __i915_nop_teardown, \ - T, ARRAY_SIZE(T), data) -#define i915_live_subtests(T, data) ({ \ + T, ARRAY_SIZE(T), data, device) +#define i915_live_subtests(T, data, device) ({ \ typecheck(struct drm_i915_private *, data); \ (data)->gt[0]->uc.guc.submission_state.sched_disable_delay_ms = 0; \ __i915_subtests(__func__, \ __i915_live_setup, __i915_live_teardown, \ - T, ARRAY_SIZE(T), data); \ + T, ARRAY_SIZE(T), data, device); \ }) -#define intel_gt_live_subtests(T, data) ({ \ +#define intel_gt_live_subtests(T, data, device) ({ \ typecheck(struct intel_gt *, data); \ (data)->uc.guc.submission_state.sched_disable_delay_ms = 0; \ __i915_subtests(__func__, \ __intel_gt_live_setup, __intel_gt_live_teardown, \ - T, ARRAY_SIZE(T), data); \ + T, ARRAY_SIZE(T), data, device); \ }) #define SUBTEST(x) { x, #x } diff --git a/drivers/gpu/drm/i915/selftests/i915_active.c b/drivers/gpu/drm/i915/selftests/i915_active.c index 79b55df1e71a..8bb9994aa116 100644 --- a/drivers/gpu/drm/i915/selftests/i915_active.c +++ b/drivers/gpu/drm/i915/selftests/i915_active.c @@ -262,7 +262,7 @@ int i915_active_live_selftests(struct drm_i915_private *i915) if (intel_gt_is_wedged(to_gt(i915))) return 0; - return i915_subtests(tests, i915); + return i915_subtests(tests, i915, &i915->drm); } static struct intel_engine_cs *node_to_barrier(struct active_node *it) diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c index ad650f67114a..e5ee5ddad81a 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem.c @@ -258,5 +258,5 @@ int i915_gem_live_selftests(struct drm_i915_private *i915) if (intel_gt_is_wedged(to_gt(i915))) return 0; - return i915_live_subtests(tests, i915); + return i915_live_subtests(tests, i915, &i915->drm); } diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_evict.c b/drivers/gpu/drm/i915/selftests/i915_gem_evict.c index 604289814f79..5abb0b9d7ae7 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem_evict.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem_evict.c @@ -571,7 +571,7 @@ int i915_gem_evict_mock_selftests(void) return -ENOMEM; with_intel_runtime_pm(&i915->runtime_pm, wakeref) - err = i915_subtests(tests, to_gt(i915)); + err = i915_subtests(tests, to_gt(i915), &i915->drm); mock_destroy_device(i915); return err; @@ -586,5 +586,5 @@ int i915_gem_evict_live_selftests(struct drm_i915_private *i915) if (intel_gt_is_wedged(to_gt(i915))) return 0; - return intel_gt_live_subtests(tests, to_gt(i915)); + return intel_gt_live_subtests(tests, to_gt(i915), &i915->drm); } diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c index 0c855f00c3ae..5c3f9626f19a 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c @@ -2004,7 +2004,7 @@ int i915_gem_gtt_mock_selftests(void) mock_init_ggtt(gt); - err = i915_subtests(tests, gt->ggtt); + err = i915_subtests(tests, gt->ggtt, &i915->drm); mock_device_flush(i915); i915_gem_drain_freed_objects(i915); @@ -2038,5 +2038,5 @@ int i915_gem_gtt_live_selftests(struct drm_i915_private *i915) GEM_BUG_ON(offset_in_page(to_gt(i915)->ggtt->vm.total)); - return i915_live_subtests(tests, i915); + return i915_live_subtests(tests, i915, &i915->drm); } diff --git a/drivers/gpu/drm/i915/selftests/i915_perf.c b/drivers/gpu/drm/i915/selftests/i915_perf.c index d2a1a901d47b..7b95b0719765 100644 --- a/drivers/gpu/drm/i915/selftests/i915_perf.c +++ b/drivers/gpu/drm/i915/selftests/i915_perf.c @@ -442,7 +442,7 @@ int i915_perf_live_selftests(struct drm_i915_private *i915) if (err) return err; - err = i915_live_subtests(tests, i915); + err = i915_live_subtests(tests, i915, &i915->drm); destroy_empty_config(&i915->perf); diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c index 431298f774e6..5c4d8137916c 100644 --- a/drivers/gpu/drm/i915/selftests/i915_request.c +++ b/drivers/gpu/drm/i915/selftests/i915_request.c @@ -572,7 +572,7 @@ int i915_request_mock_selftests(void) return -ENOMEM; with_intel_runtime_pm(&i915->runtime_pm, wakeref) - err = i915_subtests(tests, i915); + err = i915_subtests(tests, i915, &i915->drm); mock_destroy_device(i915); @@ -1928,7 +1928,7 @@ int i915_request_live_selftests(struct drm_i915_private *i915) if (intel_gt_is_wedged(to_gt(i915))) return 0; - return i915_live_subtests(tests, i915); + return i915_live_subtests(tests, i915, &i915->drm); } static int switch_to_kernel_sync(struct intel_context *ce, int err) @@ -3354,5 +3354,5 @@ int i915_request_perf_selftests(struct drm_i915_private *i915) if (intel_gt_is_wedged(to_gt(i915))) return 0; - return i915_subtests(tests, i915); + return i915_subtests(tests, i915, &i915->drm); } diff --git a/drivers/gpu/drm/i915/selftests/i915_selftest.c b/drivers/gpu/drm/i915/selftests/i915_selftest.c index fa840a7e651e..7feda1ae7d20 100644 --- a/drivers/gpu/drm/i915/selftests/i915_selftest.c +++ b/drivers/gpu/drm/i915/selftests/i915_selftest.c @@ -224,7 +224,8 @@ static struct mm_struct *get_selftest_mm(int u_pid_nr) static int __run_selftests(const char *name, struct selftest *st, unsigned int count, - void *data) + void *data, + struct drm_device *device) { struct mm_struct *mm = NULL; int u_pid_nr = -1; @@ -243,8 +244,15 @@ static int __run_selftests(const char *name, set_default_test_all(st, count); - pr_info(DRIVER_NAME ": Performing %s selftests with st_random_seed=0x%x st_timeout=%u\n", - name, i915_selftest.random_seed, i915_selftest.timeout_ms); + if (device) + drm_info(device, "Performing %s selftests with st_random_seed=0x%x st_timeout=%u\n", + name, i915_selftest.random_seed, + i915_selftest.timeout_ms); + else + pr_info(DRIVER_NAME + ": Performing %s selftests with st_random_seed=0x%x st_timeout=%u\n", + name, i915_selftest.random_seed, + i915_selftest.timeout_ms); /* * If we are running in a kthread on a multi NUMA system and the user passed @@ -258,7 +266,11 @@ static int __run_selftests(const char *name, if (unlikely(!current->mm)) { mmput(mm); mm = NULL; - pr_warn("Could not set mm as current->mm\n"); + if (device) + drm_warn(device, + "Could not set mm as current->mm\n"); + else + pr_warn("Could not set mm as current->mm\n"); } } } @@ -277,7 +289,11 @@ static int __run_selftests(const char *name, return -EINTR; } - pr_info(DRIVER_NAME ": Running %s\n", st->name); + if (device) + drm_info(device, "Running %s\n", st->name); + else + pr_info(DRIVER_NAME ": Running %s\n", st->name); + if (data) err = st->live(data); else @@ -301,8 +317,9 @@ static int __run_selftests(const char *name, return err; } -#define run_selftests(x, data) \ - __run_selftests(#x, x##_selftests, ARRAY_SIZE(x##_selftests), data) +#define run_selftests(x, data, device) \ + __run_selftests(#x, x##_selftests, ARRAY_SIZE(x##_selftests), \ + data, device) int i915_mock_selftests(void) { @@ -311,7 +328,7 @@ int i915_mock_selftests(void) if (!i915_selftest.mock) return 0; - err = run_selftests(mock, NULL); + err = run_selftests(mock, NULL, NULL); if (err) { i915_selftest.mock = err; return 1; @@ -352,7 +369,7 @@ int i915_live_selftests(struct pci_dev *pdev) __wait_gsc_proxy_completed(i915); __wait_gsc_huc_load_completed(i915); - err = run_selftests(live, i915); + err = run_selftests(live, i915, &i915->drm); if (err) { i915_selftest.live = err; return err; @@ -377,7 +394,7 @@ int i915_perf_selftests(struct pci_dev *pdev) __wait_gsc_proxy_completed(i915); __wait_gsc_huc_load_completed(i915); - err = run_selftests(perf, i915); + err = run_selftests(perf, i915, &i915->drm); if (err) { i915_selftest.perf = err; return err; @@ -495,7 +512,8 @@ int __i915_subtests(const char *caller, int (*teardown)(int err, void *data), const struct i915_subtest *st, unsigned int count, - void *data) + void *data, + struct drm_device *device) { int err; @@ -509,18 +527,31 @@ int __i915_subtests(const char *caller, err = setup(data); if (err) { - pr_err(DRIVER_NAME "/%s: setup failed for %s\n", - caller, st->name); + if (device) + drm_err(device, "%s: setup failed for %s\n", + caller, st->name); + else + pr_err(DRIVER_NAME "/%s: setup failed for %s\n", + caller, st->name); return err; } - pr_info(DRIVER_NAME ": Running %s/%s\n", caller, st->name); + if (device) + drm_info(device, "Running %s/%s\n", caller, st->name); + else + pr_info(DRIVER_NAME ": Running %s/%s\n", caller, st->name); + GEM_TRACE("Running %s/%s\n", caller, st->name); err = teardown(st->func(data), data); if (err && err != -EINTR) { - pr_err(DRIVER_NAME "/%s: %s failed with error %d\n", - caller, st->name, err); + if (device) + drm_err(device, "%s: %s failed with error %d\n", + caller, st->name, err); + else + pr_err(DRIVER_NAME + "/%s: %s failed with error %d\n", + caller, st->name, err); return err; } } diff --git a/drivers/gpu/drm/i915/selftests/i915_sw_fence.c b/drivers/gpu/drm/i915/selftests/i915_sw_fence.c index ecb2d718f6a6..ddb3c63ddd63 100644 --- a/drivers/gpu/drm/i915/selftests/i915_sw_fence.c +++ b/drivers/gpu/drm/i915/selftests/i915_sw_fence.c @@ -763,5 +763,5 @@ int i915_sw_fence_mock_selftests(void) SUBTEST(test_dma_fence), }; - return i915_subtests(tests, NULL); + return i915_subtests(tests, NULL, NULL); } diff --git a/drivers/gpu/drm/i915/selftests/i915_syncmap.c b/drivers/gpu/drm/i915/selftests/i915_syncmap.c index 88fa845e9f4a..163782c7c276 100644 --- a/drivers/gpu/drm/i915/selftests/i915_syncmap.c +++ b/drivers/gpu/drm/i915/selftests/i915_syncmap.c @@ -612,5 +612,5 @@ int i915_syncmap_mock_selftests(void) SUBTEST(igt_syncmap_random), }; - return i915_subtests(tests, NULL); + return i915_subtests(tests, NULL, NULL); } diff --git a/drivers/gpu/drm/i915/selftests/i915_vma.c b/drivers/gpu/drm/i915/selftests/i915_vma.c index 8e1e54ea0585..c754de5afa02 100644 --- a/drivers/gpu/drm/i915/selftests/i915_vma.c +++ b/drivers/gpu/drm/i915/selftests/i915_vma.c @@ -997,7 +997,7 @@ int i915_vma_mock_selftests(void) mock_init_ggtt(gt); - err = i915_subtests(tests, gt->ggtt); + err = i915_subtests(tests, gt->ggtt, &i915->drm); mock_device_flush(i915); i915_gem_drain_freed_objects(i915); @@ -1163,5 +1163,5 @@ int i915_vma_live_selftests(struct drm_i915_private *i915) SUBTEST(igt_vma_remapped_gtt), }; - return i915_live_subtests(tests, i915); + return i915_live_subtests(tests, i915, &i915->drm); } diff --git a/drivers/gpu/drm/i915/selftests/intel_memory_region.c b/drivers/gpu/drm/i915/selftests/intel_memory_region.c index 8307390943a2..ba6e6c5bbb2f 100644 --- a/drivers/gpu/drm/i915/selftests/intel_memory_region.c +++ b/drivers/gpu/drm/i915/selftests/intel_memory_region.c @@ -1363,7 +1363,7 @@ int intel_memory_region_mock_selftests(void) goto out_unref; } - err = i915_subtests(tests, mem); + err = i915_subtests(tests, mem, &i915->drm); intel_memory_region_destroy(mem); out_unref: @@ -1389,7 +1389,7 @@ int intel_memory_region_live_selftests(struct drm_i915_private *i915) if (intel_gt_is_wedged(to_gt(i915))) return 0; - return i915_live_subtests(tests, i915); + return i915_live_subtests(tests, i915, &i915->drm); } int intel_memory_region_perf_selftests(struct drm_i915_private *i915) @@ -1401,5 +1401,5 @@ int intel_memory_region_perf_selftests(struct drm_i915_private *i915) if (intel_gt_is_wedged(to_gt(i915))) return 0; - return i915_live_subtests(tests, i915); + return i915_live_subtests(tests, i915, &i915->drm); } diff --git a/drivers/gpu/drm/i915/selftests/intel_uncore.c b/drivers/gpu/drm/i915/selftests/intel_uncore.c index 1f58024150fa..a1b77e752379 100644 --- a/drivers/gpu/drm/i915/selftests/intel_uncore.c +++ b/drivers/gpu/drm/i915/selftests/intel_uncore.c @@ -296,5 +296,5 @@ int intel_uncore_live_selftests(struct drm_i915_private *i915) SUBTEST(live_forcewake_ops), }; - return intel_gt_live_subtests(tests, to_gt(i915)); + return intel_gt_live_subtests(tests, to_gt(i915), &i915->drm); } diff --git a/drivers/gpu/drm/i915/selftests/scatterlist.c b/drivers/gpu/drm/i915/selftests/scatterlist.c index 7e59591bbed6..88ad1d7e14f7 100644 --- a/drivers/gpu/drm/i915/selftests/scatterlist.c +++ b/drivers/gpu/drm/i915/selftests/scatterlist.c @@ -380,5 +380,5 @@ int scatterlist_mock_selftests(void) SUBTEST(igt_sg_trim), }; - return i915_subtests(tests, NULL); + return i915_subtests(tests, NULL, NULL); } -- 2.34.1
