drm/i915: Prefer '%ps' for printing function symbol names

%pS includes the offset, which is useful for return addresses but noise
when we are pretty printing a known (and expected) function entry point.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200319091943.7815-1-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c
index a3d38e089b6ee2f4e9f5bf8de92df87a9f01451d..7daf81f55c908571a0cafd9a76571ecd65d5aeef 100644 (file)
--- a/drivers/gpu/drm/i915/i915_sw_fence.c
+++ b/drivers/gpu/drm/i915/i915_sw_fence.c
@@ -421,7 +421,7 @@ static void timer_i915_sw_fence_wake(struct timer_list *t)
        if (!fence)
                return;
 
-       pr_notice("Asynchronous wait on fence %s:%s:%llx timed out (hint:%pS)\n",
+       pr_notice("Asynchronous wait on fence %s:%s:%llx timed out (hint:%ps)\n",
                  cb->dma->ops->get_driver_name(cb->dma),
                  cb->dma->ops->get_timeline_name(cb->dma),
                  cb->dma->seqno,

diff --git a/drivers/gpu/drm/i915/selftests/i915_active.c b/drivers/gpu/drm/i915/selftests/i915_active.c
index 68bbb158016263d79024c9ef96eee16bf7151314..54080fb4af4bedd083c52290b77c58e12c842a19 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/i915_active.c
+++ b/drivers/gpu/drm/i915/selftests/i915_active.c
@@ -277,7 +277,7 @@ static struct intel_engine_cs *node_to_barrier(struct active_node *it)
 
 void i915_active_print(struct i915_active *ref, struct drm_printer *m)
 {
-       drm_printf(m, "active %pS:%pS\n", ref->active, ref->retire);
+       drm_printf(m, "active %ps:%ps\n", ref->active, ref->retire);
        drm_printf(m, "\tcount: %d\n", atomic_read(&ref->count));
        drm_printf(m, "\tpreallocated barriers? %s\n",
                   yesno(!llist_empty(&ref->preallocated_barriers)));

diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
index f89d9c42f1fad51130d913d0aa561a6c693ab182..7ac9616de9d8f10b386b153839d8fb7296bfff43 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/i915_request.c
+++ b/drivers/gpu/drm/i915/selftests/i915_request.c
@@ -1233,7 +1233,7 @@ static int live_parallel_engines(void *arg)
                struct igt_live_test t;
                unsigned int idx;
 
-               snprintf(name, sizeof(name), "%pS", fn);
+               snprintf(name, sizeof(name), "%ps", fn);
                err = igt_live_test_begin(&t, i915, __func__, name);
                if (err)
                        break;