| Message ID | 20181207122240.6929-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/selftests: Compile fix for 64b dma-fence seqno | expand |
Am 07.12.18 um 13:22 schrieb Chris Wilson: > Many errs of the form: > drivers/gpu/drm/i915/selftests/intel_hangcheck.c: In function ‘__igt_reset_evict_vma’: > ./include/linux/kern_levels.h:5:18: error: format ‘%x’ expects argument of type ‘unsigned int’, but argum > > Fixes: b312d8ca3a7c ("dma-buf: make fence sequence numbers 64 bit v2") > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Christian König <christian.koenig@amd.com> > Cc: Chunming Zhou <david1.zhou@amd.com> > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Reviewed-by: Christian König <christian.koenig@amd.com> > --- > drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c > index 60a4bd9405be..34e200d32b7d 100644 > --- a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c > +++ b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c > @@ -450,7 +450,7 @@ static int __igt_reset_engine(struct drm_i915_private *i915, bool active) > if (!wait_until_running(&h, rq)) { > struct drm_printer p = drm_info_printer(i915->drm.dev); > > - pr_err("%s: Failed to start request %x, at %x\n", > + pr_err("%s: Failed to start request %llx, at %x\n", > __func__, rq->fence.seqno, hws_seqno(&h, rq)); > intel_engine_dump(engine, &p, > "%s\n", engine->name); > @@ -728,7 +728,7 @@ static int __igt_reset_engines(struct drm_i915_private *i915, > if (!wait_until_running(&h, rq)) { > struct drm_printer p = drm_info_printer(i915->drm.dev); > > - pr_err("%s: Failed to start request %x, at %x\n", > + pr_err("%s: Failed to start request %llx, at %x\n", > __func__, rq->fence.seqno, hws_seqno(&h, rq)); > intel_engine_dump(engine, &p, > "%s\n", engine->name); > @@ -927,7 +927,7 @@ static int igt_reset_wait(void *arg) > if (!wait_until_running(&h, rq)) { > struct drm_printer p = drm_info_printer(i915->drm.dev); > > - pr_err("%s: Failed to start request %x, at %x\n", > + pr_err("%s: Failed to start request %llx, at %x\n", > __func__, rq->fence.seqno, hws_seqno(&h, rq)); > intel_engine_dump(rq->engine, &p, "%s\n", rq->engine->name); > > @@ -1106,7 +1106,7 @@ static int __igt_reset_evict_vma(struct drm_i915_private *i915, > if (!wait_until_running(&h, rq)) { > struct drm_printer p = drm_info_printer(i915->drm.dev); > > - pr_err("%s: Failed to start request %x, at %x\n", > + pr_err("%s: Failed to start request %llx, at %x\n", > __func__, rq->fence.seqno, hws_seqno(&h, rq)); > intel_engine_dump(rq->engine, &p, "%s\n", rq->engine->name); > > @@ -1301,7 +1301,7 @@ static int igt_reset_queue(void *arg) > if (!wait_until_running(&h, prev)) { > struct drm_printer p = drm_info_printer(i915->drm.dev); > > - pr_err("%s(%s): Failed to start request %x, at %x\n", > + pr_err("%s(%s): Failed to start request %llx, at %x\n", > __func__, engine->name, > prev->fence.seqno, hws_seqno(&h, prev)); > intel_engine_dump(engine, &p, > @@ -1412,7 +1412,7 @@ static int igt_handle_error(void *arg) > if (!wait_until_running(&h, rq)) { > struct drm_printer p = drm_info_printer(i915->drm.dev); > > - pr_err("%s: Failed to start request %x, at %x\n", > + pr_err("%s: Failed to start request %llx, at %x\n", > __func__, rq->fence.seqno, hws_seqno(&h, rq)); > intel_engine_dump(rq->engine, &p, "%s\n", rq->engine->name); >
Quoting Chris Wilson (2018-12-07 12:22:40) > Many errs of the form: > drivers/gpu/drm/i915/selftests/intel_hangcheck.c: In function ‘__igt_reset_evict_vma’: > ./include/linux/kern_levels.h:5:18: error: format ‘%x’ expects argument of type ‘unsigned int’, but argum Wait, there's more! -Chris
diff --git a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c index 60a4bd9405be..34e200d32b7d 100644 --- a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c +++ b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c @@ -450,7 +450,7 @@ static int __igt_reset_engine(struct drm_i915_private *i915, bool active) if (!wait_until_running(&h, rq)) { struct drm_printer p = drm_info_printer(i915->drm.dev); - pr_err("%s: Failed to start request %x, at %x\n", + pr_err("%s: Failed to start request %llx, at %x\n", __func__, rq->fence.seqno, hws_seqno(&h, rq)); intel_engine_dump(engine, &p, "%s\n", engine->name); @@ -728,7 +728,7 @@ static int __igt_reset_engines(struct drm_i915_private *i915, if (!wait_until_running(&h, rq)) { struct drm_printer p = drm_info_printer(i915->drm.dev); - pr_err("%s: Failed to start request %x, at %x\n", + pr_err("%s: Failed to start request %llx, at %x\n", __func__, rq->fence.seqno, hws_seqno(&h, rq)); intel_engine_dump(engine, &p, "%s\n", engine->name); @@ -927,7 +927,7 @@ static int igt_reset_wait(void *arg) if (!wait_until_running(&h, rq)) { struct drm_printer p = drm_info_printer(i915->drm.dev); - pr_err("%s: Failed to start request %x, at %x\n", + pr_err("%s: Failed to start request %llx, at %x\n", __func__, rq->fence.seqno, hws_seqno(&h, rq)); intel_engine_dump(rq->engine, &p, "%s\n", rq->engine->name); @@ -1106,7 +1106,7 @@ static int __igt_reset_evict_vma(struct drm_i915_private *i915, if (!wait_until_running(&h, rq)) { struct drm_printer p = drm_info_printer(i915->drm.dev); - pr_err("%s: Failed to start request %x, at %x\n", + pr_err("%s: Failed to start request %llx, at %x\n", __func__, rq->fence.seqno, hws_seqno(&h, rq)); intel_engine_dump(rq->engine, &p, "%s\n", rq->engine->name); @@ -1301,7 +1301,7 @@ static int igt_reset_queue(void *arg) if (!wait_until_running(&h, prev)) { struct drm_printer p = drm_info_printer(i915->drm.dev); - pr_err("%s(%s): Failed to start request %x, at %x\n", + pr_err("%s(%s): Failed to start request %llx, at %x\n", __func__, engine->name, prev->fence.seqno, hws_seqno(&h, prev)); intel_engine_dump(engine, &p, @@ -1412,7 +1412,7 @@ static int igt_handle_error(void *arg) if (!wait_until_running(&h, rq)) { struct drm_printer p = drm_info_printer(i915->drm.dev); - pr_err("%s: Failed to start request %x, at %x\n", + pr_err("%s: Failed to start request %llx, at %x\n", __func__, rq->fence.seqno, hws_seqno(&h, rq)); intel_engine_dump(rq->engine, &p, "%s\n", rq->engine->name);
Many errs of the form: drivers/gpu/drm/i915/selftests/intel_hangcheck.c: In function ‘__igt_reset_evict_vma’: ./include/linux/kern_levels.h:5:18: error: format ‘%x’ expects argument of type ‘unsigned int’, but argum Fixes: b312d8ca3a7c ("dma-buf: make fence sequence numbers 64 bit v2") Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Christian König <christian.koenig@amd.com> Cc: Chunming Zhou <david1.zhou@amd.com> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> --- drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)