[Intel-gfx] [PATCH 6/8] drm/i915/guc: Extract clients allocation to submission_init

[Michel Thierry]

On 13/12/17 04:50, Michał Winiarski wrote:
> We can now move the clients allocation to submission_init path, rather
> than keeping the condition inside submission_enable called on every
> reset.
> 
> Signed-off-by: Michał Winiarski <michal.winiarski at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
> ---

Reviewed-by: Michel Thierry <michel.thierry at intel.com>

>   drivers/gpu/drm/i915/intel_guc_submission.c | 33 ++++++++++-------------------
>   1 file changed, 11 insertions(+), 22 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c
> index c74e78b6ba41..488110602e7e 100644
> --- a/drivers/gpu/drm/i915/intel_guc_submission.c
> +++ b/drivers/gpu/drm/i915/intel_guc_submission.c
> @@ -1149,6 +1149,10 @@ int intel_guc_submission_init(struct intel_guc *guc)
>                  goto err_log;
>          GEM_BUG_ON(!guc->ads_vma);
> 
> +       ret = guc_clients_create(guc);
> +       if (ret)
> +               return ret;
> +
>          for_each_engine(engine, dev_priv, id) {
>                  guc->preempt_work[id].engine = engine;
>                  INIT_WORK(&guc->preempt_work[id].work, inject_preempt_context);
> @@ -1172,6 +1176,7 @@ void intel_guc_submission_fini(struct intel_guc *guc)
>          for_each_engine(engine, dev_priv, id)
>                  cancel_work_sync(&guc->preempt_work[id].work);
> 
> +       guc_clients_destroy(guc);
>          guc_ads_destroy(guc);
>          intel_guc_log_destroy(guc);
>          guc_stage_desc_pool_destroy(guc);
> @@ -1277,28 +1282,18 @@ int intel_guc_submission_enable(struct intel_guc *guc)
>                       sizeof(struct guc_wq_item) *
>                       I915_NUM_ENGINES > GUC_WQ_SIZE);
> 
> -       /*
> -        * We're being called on both module initialization and on reset,
> -        * until this flow is changed, we're using regular client presence to
> -        * determine which case are we in, and whether we should allocate new
> -        * clients or just reset their workqueues.
> -        */
> -       if (!guc->execbuf_client) {
> -               err = guc_clients_create(guc);
> -               if (err)
> -                       return err;
> -       } else {
> -               guc_reset_wq(guc->execbuf_client);
> -               guc_reset_wq(guc->preempt_client);
> -       }
> +       GEM_BUG_ON(!guc->execbuf_client);
> +
> +       guc_reset_wq(guc->execbuf_client);
> +       guc_reset_wq(guc->preempt_client);
> 
>          err = intel_guc_sample_forcewake(guc);
>          if (err)
> -               goto err_free_clients;
> +               return err;
> 
>          err = guc_clients_doorbell_init(guc);
>          if (err)
> -               goto err_free_clients;
> +               return err;
> 
>          /* Take over from manual control of ELSP (execlists) */
>          guc_interrupts_capture(dev_priv);
> @@ -1315,10 +1310,6 @@ int intel_guc_submission_enable(struct intel_guc *guc)
>          }
> 
>          return 0;
> -
> -err_free_clients:
> -       guc_clients_destroy(guc);
> -       return err;
>   }
> 
>   void intel_guc_submission_disable(struct intel_guc *guc)
> @@ -1332,8 +1323,6 @@ void intel_guc_submission_disable(struct intel_guc *guc)
> 
>          /* Revert back to manual ELSP submission */
>          intel_engines_reset_default_submission(dev_priv);
> -
> -       guc_clients_destroy(guc);
>   }
> 
>   #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
> --
> 2.14.3
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>