Hi Krzysztof,
On 2026-08-28 at 10:03:34 +0000, Krzysztof Karas wrote:
> Move away from generic pr prints to device context aware drm
> versions.
>
> Assisted-by: GitHub-Copilot:claude-opus-5
> Signed-off-by: Krzysztof Karas <[email protected]>
> ---
> drivers/gpu/drm/i915/selftests/i915_active.c | 12 +++++++-----
> drivers/gpu/drm/i915/selftests/igt_flush_test.c | 7 +++++--
> drivers/gpu/drm/i915/selftests/igt_live_test.c | 6 +++---
> drivers/gpu/drm/i915/selftests/igt_reset.c | 5 ++++-
> .../gpu/drm/i915/selftests/intel_scheduler_helpers.c | 8 ++++++--
> drivers/gpu/drm/i915/selftests/mock_gem_device.c | 4 +++-
> 6 files changed, 28 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/selftests/i915_active.c
> b/drivers/gpu/drm/i915/selftests/i915_active.c
> index 9fea2fabeac4..79b55df1e71a 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_active.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_active.c
> @@ -115,7 +115,7 @@ __live_active_setup(struct drm_i915_private *i915)
> err = i915_active_add_request(&active->base, rq);
> i915_request_add(rq);
> if (err) {
> - pr_err("Failed to track active ref!\n");
> + drm_err(&i915->drm, "Failed to track active ref!\n");
> break;
> }
>
> @@ -124,12 +124,13 @@ __live_active_setup(struct drm_i915_private *i915)
>
> i915_active_release(&active->base);
> if (READ_ONCE(active->retired) && count) {
> - pr_err("i915_active retired before submission!\n");
> + drm_err(&i915->drm, "i915_active retired before submission!\n");
> err = -EINVAL;
> }
> if (atomic_read(&active->base.count) != count) {
> - pr_err("i915_active not tracking all requests, found %d,
> expected %d\n",
> - atomic_read(&active->base.count), count);
> + drm_err(&i915->drm,
> + "i915_active not tracking all requests, found %d,
> expected %d\n",
> + atomic_read(&active->base.count), count);
> err = -EINVAL;
> }
>
> @@ -236,7 +237,8 @@ static int live_active_barrier(void *arg)
>
> __i915_active_wait(&active->base, TASK_UNINTERRUPTIBLE);
> if (!READ_ONCE(active->retired)) {
> - pr_err("i915_active not retired after flushing barriers!\n");
> + drm_err(&i915->drm,
> + "i915_active not retired after flushing barriers!\n");
> err = -EINVAL;
> }
>
> diff --git a/drivers/gpu/drm/i915/selftests/igt_flush_test.c
> b/drivers/gpu/drm/i915/selftests/igt_flush_test.c
> index c383d31d46b0..86164d1258c6 100644
> --- a/drivers/gpu/drm/i915/selftests/igt_flush_test.c
> +++ b/drivers/gpu/drm/i915/selftests/igt_flush_test.c
> @@ -7,6 +7,8 @@
> #include "gt/intel_gt.h"
> #include "gt/intel_gt_requests.h"
>
> +#include <drm/drm_print.h>
> +
Same nit as in the previous patch with the drm includes going before ""
i915 specific includes.
Rest LGTM to so far
> #include "i915_drv.h"
> #include "i915_selftest.h"
>
> @@ -35,8 +37,9 @@ int igt_flush_test(struct drm_i915_private *i915)
>
> /* 2x longest preempt timeout, experimentally determined */
> if (intel_gt_wait_for_idle(gt, HZ * timeout_ms / 500) ==
> -ETIME) {
> - pr_err("%pS timed out, cancelling all further
> testing.\n",
> - __builtin_return_address(0));
> + drm_err(>->i915->drm,
> + "%pS timed out, cancelling all further
> testing.\n",
> + __builtin_return_address(0));
>
> GEM_TRACE("%pS timed out.\n",
> __builtin_return_address(0));
> diff --git a/drivers/gpu/drm/i915/selftests/igt_live_test.c
> b/drivers/gpu/drm/i915/selftests/igt_live_test.c
> index 7d41874a49c5..c1fbd98d3164 100644
> --- a/drivers/gpu/drm/i915/selftests/igt_live_test.c
> +++ b/drivers/gpu/drm/i915/selftests/igt_live_test.c
> @@ -59,9 +59,9 @@ int igt_live_test_end(struct igt_live_test *t)
> return -EIO;
>
> if (t->reset_global != i915_reset_count(&i915->gpu_error)) {
> - pr_err("%s(%s): GPU was reset %d times!\n",
> - t->func, t->name,
> - i915_reset_count(&i915->gpu_error) - t->reset_global);
> + drm_err(&i915->drm, "%s(%s): GPU was reset %d times!\n",
> + t->func, t->name,
> + i915_reset_count(&i915->gpu_error) - t->reset_global);
> return -EIO;
> }
>
> diff --git a/drivers/gpu/drm/i915/selftests/igt_reset.c
> b/drivers/gpu/drm/i915/selftests/igt_reset.c
> index a2838c65f8a5..7902ed9ad339 100644
> --- a/drivers/gpu/drm/i915/selftests/igt_reset.c
> +++ b/drivers/gpu/drm/i915/selftests/igt_reset.c
> @@ -4,6 +4,8 @@
> * Copyright © 2018 Intel Corporation
> */
>
> +#include <drm/drm_print.h>
> +
> #include "igt_reset.h"
>
> #include "gt/intel_engine.h"
> @@ -16,7 +18,8 @@ void igt_global_reset_lock(struct intel_gt *gt)
> struct intel_engine_cs *engine;
> enum intel_engine_id id;
>
> - pr_debug("%s: current gpu_error=%08lx\n", __func__, gt->reset.flags);
> + drm_dbg(>->i915->drm, "%s: current gpu_error=%08lx\n", __func__,
> + gt->reset.flags);
>
> while (test_and_set_bit(I915_RESET_BACKOFF, >->reset.flags))
> wait_event(gt->reset.queue,
> diff --git a/drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c
> b/drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c
> index e14ac0ab1314..83f66fe4a9d5 100644
> --- a/drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c
> +++ b/drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c
> @@ -5,6 +5,8 @@
>
> #include <linux/jiffies.h>
>
> +#include <drm/drm_print.h>
> +
> //#include "gt/intel_engine_user.h"
> #include "gt/intel_gt.h"
> #include "i915_drv.h"
> @@ -24,7 +26,7 @@ struct intel_engine_cs
> *intel_selftest_find_any_engine(struct intel_gt *gt)
> for_each_engine(engine, gt, id)
> return engine;
>
> - pr_err("No valid engine found!\n");
> + drm_err(>->i915->drm, "No valid engine found!\n");
> return NULL;
> }
>
> @@ -60,7 +62,9 @@ int intel_selftest_modify_policy(struct intel_engine_cs
> *engine,
> break;
>
> default:
> - pr_err("Invalid scheduler policy modification type: %d!\n",
> modify_type);
> + drm_err(&engine->i915->drm,
> + "Invalid scheduler policy modification type: %d!\n",
> + modify_type);
> return -EINVAL;
> }
>
> diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
> b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
> index 796c9b070e41..c0dadcd961bb 100644
> --- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
> +++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
> @@ -169,7 +169,9 @@ struct drm_i915_private *mock_gem_device(void)
> i915 = devm_drm_dev_alloc(&pdev->dev, &mock_driver,
> struct drm_i915_private, drm);
> if (IS_ERR(i915)) {
> - pr_err("Failed to allocate mock GEM device: err=%ld\n",
> PTR_ERR(i915));
> + dev_err(&pdev->dev,
> + "Failed to allocate mock GEM device: err=%ld\n",
> + PTR_ERR(i915));
> devres_release_group(&pdev->dev, NULL);
> put_device(&pdev->dev);
>
> --
> 2.34.1
>
