Quoting Michał Winiarski (2017-09-11 14:10:00)
> Originally removed in:
> c1adab970348 ("drm/i915/guc: Remove failed doorbell stat from debugfs")
> f1448a62a103 ("drm/i915/guc: Remove last submission result from debugfs")
>
> Were accidentaly restored in:
> 925344ccc91d ("BackMerge tag 'v4.12-rc5' into drm-next")
>
> We can also remove unused variable and replace it with a WARN.
>
> Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> Cc: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx>
> Signed-off-by: Michał Winiarski <michal.winiarski@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_guc_submission.c | 3 +--
> drivers/gpu/drm/i915/intel_uc.h | 4 ----
> 2 files changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c
> index 48a1e9349a2c..8a550785b257 100644
> --- a/drivers/gpu/drm/i915/i915_guc_submission.c
> +++ b/drivers/gpu/drm/i915/i915_guc_submission.c
> @@ -602,7 +602,6 @@ static void __i915_guc_submit(struct drm_i915_gem_request *rq)
> struct intel_guc *guc = &rq->i915->guc;
> struct i915_guc_client *client = guc->execbuf_client;
> unsigned long flags;
> - int b_ret;
>
> /* WA to flush out the pending GMADR writes to ring buffer. */
> if (i915_vma_is_map_and_fenceable(rq->ring->vma))
> @@ -611,7 +610,7 @@ static void __i915_guc_submit(struct drm_i915_gem_request *rq)
> spin_lock_irqsave(&client->wq_lock, flags);
>
> guc_wq_item_append(client, rq);
> - b_ret = guc_ring_doorbell(client);
> + WARN_ON(guc_ring_doorbell(client));
>
> client->submissions[engine_id] += 1;
>
> diff --git a/drivers/gpu/drm/i915/intel_uc.h b/drivers/gpu/drm/i915/intel_uc.h
> index 22ae52b17b0f..69daf4c01cd0 100644
> --- a/drivers/gpu/drm/i915/intel_uc.h
> +++ b/drivers/gpu/drm/i915/intel_uc.h
> @@ -59,10 +59,6 @@ struct drm_i915_gem_request;
> * available in the work queue (note, the queue is shared,
> * not per-engine). It is OK for this to be nonzero, but
> * it should not be huge!
no_wq_space^^ is also dead
> - * b_fail: failed to ring the doorbell. This should never happen, unless
> - * somehow the hardware misbehaves, or maybe if the GuC firmware
> - * crashes? We probably need to reset the GPU to recover.
> - * retcode: errno from last guc_submit()
> */
> struct i915_guc_client {
> struct i915_vma *vma;
Reviewed-y Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
