On Thu, Jul 12, 2018 at 11:58:30AM +0100, Chris Wilson wrote:
> If we fail the module load, we may try and cleanup before we even
> allocate the GuC clients. KISS in order to try and re-enable
> drv_module_reload for BAT.
>
> Testcase: igt/drv_module_reload/basic-reload-inject
> Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> Cc: Michał Winiarski <michal.winiarski@xxxxxxxxx>
> Cc: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx>
Reviewed-by: Michał Winiarski <michal.winiarski@xxxxxxxxx>
We want to fix the cleanup paths eventually though.
-Michał
> ---
> drivers/gpu/drm/i915/intel_guc_submission.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c
> index 3952656f4c9a..cd51be8ff025 100644
> --- a/drivers/gpu/drm/i915/intel_guc_submission.c
> +++ b/drivers/gpu/drm/i915/intel_guc_submission.c
> @@ -910,8 +910,12 @@ static void guc_clients_doorbell_fini(struct intel_guc *guc)
> __update_doorbell_desc(guc->preempt_client,
> GUC_DOORBELL_INVALID);
> }
> - __destroy_doorbell(guc->execbuf_client);
> - __update_doorbell_desc(guc->execbuf_client, GUC_DOORBELL_INVALID);
> +
> + if (guc->execbuf_client) {
> + __destroy_doorbell(guc->execbuf_client);
> + __update_doorbell_desc(guc->execbuf_client,
> + GUC_DOORBELL_INVALID);
> + }
> }
>
> /**
> --
> 2.18.0
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
