drm/i915: Refactor tests for validity of RING_TAIL

[karo-tx-linux.git] / drivers / gpu / drm / i915 / intel_lrc.c

diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 39cb84a5d4e41b71c22c7d1442a74e6c2d517ce2..b0c3a029b592e06a2c18d150e8fa4252b90f88ae 100644 (file)
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -326,8 +326,7 @@ static u64 execlists_update_context(struct drm_i915_gem_request *rq)
                rq->ctx->ppgtt ?: rq->i915->mm.aliasing_ppgtt;
        u32 *reg_state = ce->lrc_reg_state;
 
-       GEM_BUG_ON(!IS_ALIGNED(rq->tail, 8));
-       GEM_BUG_ON(rq->tail >= rq->ring->size);
+       assert_ring_tail_valid(rq->ring, rq->tail);
        reg_state[CTX_RING_TAIL+1] = rq->tail;
 
        /* True 32b PPGTT with dynamic page allocation: update PDP
@@ -1282,8 +1281,7 @@ static void reset_common_ring(struct intel_engine_cs *engine,
        request->tail =
                intel_ring_wrap(request->ring,
                                request->wa_tail - WA_TAIL_DWORDS*sizeof(u32));
-       GEM_BUG_ON(!IS_ALIGNED(request->tail, 8));
-       GEM_BUG_ON(request->tail >= request->ring->size);
+       assert_ring_tail_valid(request->ring, request->tail);
 }
 
 static int intel_logical_ring_emit_pdps(struct drm_i915_gem_request *req)
@@ -1494,8 +1492,7 @@ static void gen8_emit_breadcrumb(struct drm_i915_gem_request *request, u32 *cs)
        *cs++ = MI_USER_INTERRUPT;
        *cs++ = MI_NOOP;
        request->tail = intel_ring_offset(request, cs);
-       GEM_BUG_ON(!IS_ALIGNED(request->tail, 8));
-       GEM_BUG_ON(request->tail >= request->ring->size);
+       assert_ring_tail_valid(request->ring, request->tail);
 
        gen8_emit_wa_tail(request, cs);
 }
@@ -1523,8 +1520,7 @@ static void gen8_emit_breadcrumb_render(struct drm_i915_gem_request *request,
        *cs++ = MI_USER_INTERRUPT;
        *cs++ = MI_NOOP;
        request->tail = intel_ring_offset(request, cs);
-       GEM_BUG_ON(!IS_ALIGNED(request->tail, 8));
-       GEM_BUG_ON(request->tail >= request->ring->size);
+       assert_ring_tail_valid(request->ring, request->tail);
 
        gen8_emit_wa_tail(request, cs);
 }