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

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_gem_context.c

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 371c070870951d6d1523d828ebfc9874a56e1977..4ec386950f75d72e1337a7f93f986b514caad875 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -649,7 +649,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);
@@ -686,14 +686,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);
@@ -749,7 +749,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);