1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 187bb0ceb4ac..87eebc13c0d8 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -608,7 +608,9 @@ static void skip_request(struct i915_request *rq)
 
 static void reset_ring(struct intel_engine_cs *engine, struct i915_request *rq)
 {
-        GEM_TRACE("%s seqno=%x\n", engine->name, rq ? rq->global_seqno : 0);
+        GEM_TRACE("%s request global=%d, current=%d\n",
+                  engine->name, rq ? rq->global_seqno : 0,
+                  intel_engine_get_seqno(engine));
 
         /*
          * Try to restore the logical GPU state to match the continuation
@@ -1055,8 +1057,7 @@ i915_emit_bb_start(struct i915_request *rq,
 int intel_ring_pin(struct intel_ring *ring)
 {
         struct i915_vma *vma = ring->vma;
-        enum i915_map_type map =
-                HAS_LLC(vma->vm->i915) ? I915_MAP_WB : I915_MAP_WC;
+        enum i915_map_type map = i915_coherent_map_type(vma->vm->i915);
         unsigned int flags;
         void *addr;
         int ret;