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.c

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 216f52b744a637fca6406fe31a25f5d5befa4c2c..7399ac7a562924890b47c5eac4d52371bbcd8e2c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3184,7 +3184,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));
@@ -3308,7 +3308,7 @@ static void nop_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);