aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_engine_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915/intel_engine_cs.c')
-rw-r--r--drivers/gpu/drm/i915/intel_engine_cs.c7
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 {
611 u32 cs[1024]; 611 u32 cs[1024];
612}; 612};
613 613
614static int measure_breadcrumb_sz(struct intel_engine_cs *engine) 614static int measure_breadcrumb_dw(struct intel_engine_cs *engine)
615{ 615{
616 struct measure_breadcrumb *frame; 616 struct measure_breadcrumb *frame;
617 unsigned int dw; 617 unsigned int dw;
@@ -637,7 +637,6 @@ static int measure_breadcrumb_sz(struct intel_engine_cs *engine)
637 frame->rq.timeline = &frame->timeline; 637 frame->rq.timeline = &frame->timeline;
638 638
639 dw = engine->emit_breadcrumb(&frame->rq, frame->cs) - frame->cs; 639 dw = engine->emit_breadcrumb(&frame->rq, frame->cs) - frame->cs;
640 GEM_BUG_ON(dw != engine->emit_breadcrumb_sz);
641 640
642 i915_timeline_fini(&frame->timeline); 641 i915_timeline_fini(&frame->timeline);
643 kfree(frame); 642 kfree(frame);
@@ -698,11 +697,11 @@ int intel_engine_init_common(struct intel_engine_cs *engine)
698 if (ret) 697 if (ret)
699 goto err_breadcrumbs; 698 goto err_breadcrumbs;
700 699
701 ret = measure_breadcrumb_sz(engine); 700 ret = measure_breadcrumb_dw(engine);
702 if (ret < 0) 701 if (ret < 0)
703 goto err_status_page; 702 goto err_status_page;
704 703
705 engine->emit_breadcrumb_sz = ret; 704 engine->emit_breadcrumb_dw = ret;
706 705
707 return 0; 706 return 0;
708 707