drm/i915: Remove manual breadcumb counting

Now that we know we measure the size of the engine->emit_breadcrumb()
correctly, we can remove the previous manual counting.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190125120005.25191-1-chris@chris-wilson.co.uk

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index 8f738a7cd117..ef4c8c50a4ba 100644
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -611,7 +611,7 @@ struct measure_breadcrumb {
         u32 cs[1024];
 };
 
-static int measure_breadcrumb_sz(struct intel_engine_cs *engine)
+static int measure_breadcrumb_dw(struct intel_engine_cs *engine)
 {
         struct measure_breadcrumb *frame;
         unsigned int dw;
@@ -637,7 +637,6 @@ static int measure_breadcrumb_sz(struct intel_engine_cs *engine)
         frame->rq.timeline = &frame->timeline;
 
         dw = engine->emit_breadcrumb(&frame->rq, frame->cs) - frame->cs;
-        GEM_BUG_ON(dw != engine->emit_breadcrumb_sz);
 
         i915_timeline_fini(&frame->timeline);
         kfree(frame);
@@ -698,11 +697,11 @@ int intel_engine_init_common(struct intel_engine_cs *engine)
         if (ret)
                 goto err_breadcrumbs;
 
-        ret = measure_breadcrumb_sz(engine);
+        ret = measure_breadcrumb_dw(engine);
         if (ret < 0)
                 goto err_status_page;
 
-        engine->emit_breadcrumb_sz = ret;
+        engine->emit_breadcrumb_dw = ret;
 
         return 0;