Merge tag 'drm-misc-next-2019-01-07-1' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-2.6-block.git] / drivers / gpu / drm / i915 / selftests / intel_hangcheck.c

diff --git a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c
index 40efbed611de8d80e8734e223d91fd5604e1d4f3..5910da3e7d7991f871342f733703dac28f01a1a5 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c
+++ b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c
@@ -451,7 +451,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);
@@ -552,7 +552,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,
@@ -729,7 +729,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);
@@ -928,7 +928,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);
 
@@ -1107,7 +1107,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);
 
@@ -1302,7 +1302,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,
@@ -1413,7 +1413,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);