drm/i915: Compile fix for 64b dma-fence seqno

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")
Cc: Christian König <christian.koenig@amd.com>
Cc: Chunming Zhou <david1.zhou@amd.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20181207123428.16257-1-mika.kuoppala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index c55b1f75c9803e72fe339020bec14d1718385ab2..b70de1a9e899d7bd555e370fbdfcb4716d9078c3 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3187,7 +3187,7 @@ i915_gem_reset_request(struct intel_engine_cs *engine,
         */
 
        if (i915_request_completed(request)) {
-               GEM_TRACE("%s pardoned global=%d (fence %llx:%d), current %d\n",
+               GEM_TRACE("%s pardoned global=%d (fence %llx:%lld), current %d\n",
                          engine->name, request->global_seqno,
                          request->fence.context, request->fence.seqno,
                          intel_engine_get_seqno(engine));
@@ -3321,7 +3321,7 @@ static void nop_complete_submit_request(struct i915_request *request)
 {
        unsigned long flags;
 
-       GEM_TRACE("%s fence %llx:%d -> -EIO\n",
+       GEM_TRACE("%s fence %llx:%lld -> -EIO\n",
                  request->engine->name,
                  request->fence.context, request->fence.seqno);
        dma_fence_set_error(&request->fence, -EIO);

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index b97963db0287ab51a2cdf5e599bb5b01ac13c35f..66117a8281ef471f62b6ca49c3f81ecbdea15aea 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -653,7 +653,7 @@ last_request_on_engine(struct i915_timeline *timeline,
        rq = i915_gem_active_raw(&timeline->last_request,
                                 &engine->i915->drm.struct_mutex);
        if (rq && rq->engine == engine) {
-               GEM_TRACE("last request for %s on engine %s: %llx:%d\n",
+               GEM_TRACE("last request for %s on engine %s: %llx:%llu\n",
                          timeline->name, engine->name,
                          rq->fence.context, rq->fence.seqno);
                GEM_BUG_ON(rq->timeline != timeline);
@@ -690,14 +690,14 @@ static bool engine_has_kernel_context_barrier(struct intel_engine_cs *engine)
                 * switch-to-kernel-context?
                 */
                if (!i915_timeline_sync_is_later(barrier, &rq->fence)) {
-                       GEM_TRACE("%s needs barrier for %llx:%d\n",
+                       GEM_TRACE("%s needs barrier for %llx:%lld\n",
                                  ring->timeline->name,
                                  rq->fence.context,
                                  rq->fence.seqno);
                        return false;
                }
 
-               GEM_TRACE("%s has barrier after %llx:%d\n",
+               GEM_TRACE("%s has barrier after %llx:%lld\n",
                          ring->timeline->name,
                          rq->fence.context,
                          rq->fence.seqno);
@@ -753,7 +753,7 @@ int i915_gem_switch_to_kernel_context(struct drm_i915_private *i915)
                        if (prev->gem_context == i915->kernel_context)
                                continue;
 
-                       GEM_TRACE("add barrier on %s for %llx:%d\n",
+                       GEM_TRACE("add barrier on %s for %llx:%lld\n",
                                  engine->name,
                                  prev->fence.context,
                                  prev->fence.seqno);

diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
index 71107540581dc783af2aac8bce8a1e78763ad00d..191703986c7b2efd1b0287c5b9671f50e7fb83a9 100644 (file)
--- a/drivers/gpu/drm/i915/i915_request.c
+++ b/drivers/gpu/drm/i915/i915_request.c
@@ -267,7 +267,7 @@ static void free_capture_list(struct i915_request *request)
 static void __retire_engine_request(struct intel_engine_cs *engine,
                                    struct i915_request *rq)
 {
-       GEM_TRACE("%s(%s) fence %llx:%d, global=%d, current %d\n",
+       GEM_TRACE("%s(%s) fence %llx:%lld, global=%d, current %d\n",
                  __func__, engine->name,
                  rq->fence.context, rq->fence.seqno,
                  rq->global_seqno,
@@ -329,7 +329,7 @@ static void i915_request_retire(struct i915_request *request)
 {
        struct i915_gem_active *active, *next;
 
-       GEM_TRACE("%s fence %llx:%d, global=%d, current %d\n",
+       GEM_TRACE("%s fence %llx:%lld, global=%d, current %d\n",
                  request->engine->name,
                  request->fence.context, request->fence.seqno,
                  request->global_seqno,
@@ -392,7 +392,7 @@ void i915_request_retire_upto(struct i915_request *rq)
        struct intel_ring *ring = rq->ring;
        struct i915_request *tmp;
 
-       GEM_TRACE("%s fence %llx:%d, global=%d, current %d\n",
+       GEM_TRACE("%s fence %llx:%lld, global=%d, current %d\n",
                  rq->engine->name,
                  rq->fence.context, rq->fence.seqno,
                  rq->global_seqno,
@@ -433,7 +433,7 @@ void __i915_request_submit(struct i915_request *request)
        struct intel_engine_cs *engine = request->engine;
        u32 seqno;
 
-       GEM_TRACE("%s fence %llx:%d -> global=%d, current %d\n",
+       GEM_TRACE("%s fence %llx:%lld -> global=%d, current %d\n",
                  engine->name,
                  request->fence.context, request->fence.seqno,
                  engine->timeline.seqno + 1,
@@ -483,7 +483,7 @@ void __i915_request_unsubmit(struct i915_request *request)
 {
        struct intel_engine_cs *engine = request->engine;
 
-       GEM_TRACE("%s fence %llx:%d <- global=%d, current %d\n",
+       GEM_TRACE("%s fence %llx:%lld <- global=%d, current %d\n",
                  engine->name,
                  request->fence.context, request->fence.seqno,
                  request->global_seqno,
@@ -958,7 +958,7 @@ void i915_request_add(struct i915_request *request)
        struct i915_request *prev;
        u32 *cs;
 
-       GEM_TRACE("%s fence %llx:%d\n",
+       GEM_TRACE("%s fence %llx:%lld\n",
                  engine->name, request->fence.context, request->fence.seqno);
 
        lockdep_assert_held(&request->i915->drm.struct_mutex);

diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 08fd9b12e4d7408b8e2c3d626f921aef7152d012..9399db3260ad9eb74f3379291464fbe0906482b4 100644 (file)
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -450,7 +450,7 @@ static void execlists_submit_ports(struct intel_engine_cs *engine)
                        desc = execlists_update_context(rq);
                        GEM_DEBUG_EXEC(port[n].context_id = upper_32_bits(desc));
 
-                       GEM_TRACE("%s in[%d]:  ctx=%d.%d, global=%d (fence %llx:%d) (current %d), prio=%d\n",
+                       GEM_TRACE("%s in[%d]:  ctx=%d.%d, global=%d (fence %llx:%lld) (current %d), prio=%d\n",
                                  engine->name, n,
                                  port[n].context_id, count,
                                  rq->global_seqno,
@@ -743,7 +743,7 @@ execlists_cancel_port_requests(struct intel_engine_execlists * const execlists)
        while (num_ports-- && port_isset(port)) {
                struct i915_request *rq = port_request(port);
 
-               GEM_TRACE("%s:port%u global=%d (fence %llx:%d), (current %d)\n",
+               GEM_TRACE("%s:port%u global=%d (fence %llx:%lld), (current %d)\n",
                          rq->engine->name,
                          (unsigned int)(port - execlists->port),
                          rq->global_seqno,
@@ -952,7 +952,7 @@ static void process_csb(struct intel_engine_cs *engine)
                                                EXECLISTS_ACTIVE_USER));
 
                rq = port_unpack(port, &count);
-               GEM_TRACE("%s out[0]: ctx=%d.%d, global=%d (fence %llx:%d) (current %d), prio=%d\n",
+               GEM_TRACE("%s out[0]: ctx=%d.%d, global=%d (fence %llx:%lld) (current %d), prio=%d\n",
                          engine->name,
                          port->context_id, count,
                          rq ? rq->global_seqno : 0,

diff --git a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c
index defe671130abfb99cccb4209b230673b4f6fb929..33494d922fab98b4906d9e29504854a1ee77ad5d 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c
+++ b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c
@@ -478,7 +478,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);
@@ -579,7 +579,7 @@ static int active_request_put(struct i915_request *rq)
                return 0;
 
        if (i915_request_wait(rq, 0, 5 * HZ) < 0) {
-               GEM_TRACE("%s timed out waiting for completion of fence %llx:%d, seqno %d.\n",
+               GEM_TRACE("%s timed out waiting for completion of fence %llx:%lld, seqno %d.\n",
                          rq->engine->name,
                          rq->fence.context,
                          rq->fence.seqno,
@@ -756,7 +756,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);
@@ -955,7 +955,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);
 
@@ -1134,7 +1134,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);
 
@@ -1329,7 +1329,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,
@@ -1440,7 +1440,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);