[PATCH] drm/amdgpu: Reserve fence slots for command submission

ckoenig.leichtzumerken@xxxxxxxxx (Christian König) · Wed, 4 Jul 2018 08:34:44 +0200

Am 04.07.2018 um 05:02 schrieb Junwei Zhang:
> From: Michel DÃ¤nzer <michel.daenzer at amd.com>
>
> Without this, there could not be enough slots, which could trigger the
> BUG_ON in reservation_object_add_shared_fence.
>
> v2:
> * Jump to the error label instead of returning directly (Jerry Zhang)
> v3:
> * Reserve slots for command submission after VM updates (Christian KÃ¶nig)
>
> Cc: stable at vger.kernel.org
> Bugzilla: https://bugs.freedesktop.org/106418
> Reported-by: mikhail.v.gavrilov at gmail.com
> Signed-off-by: Michel DÃ¤nzer <michel.daenzer at amd.com>
> Signed-off-by: Junwei Zhang <Jerry.Zhang at amd.com>

I would put that at the end of amdgpu_bo_vm_update_pte(), but that is 
only a minor nit pick.

Patch is Reviewed-by: Christian KÃ¶nig <christian.koenig at amd.com> anyway.

Regards,
Christian.

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> index 7a625f3..1bc0281 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> @@ -928,6 +928,10 @@ static int amdgpu_cs_ib_vm_chunk(struct amdgpu_device *adev,
>   		r = amdgpu_bo_vm_update_pte(p);
>   		if (r)
>   			return r;
> +
> +		r = reservation_object_reserve_shared(vm->root.base.bo->tbo.resv);
> +		if (r)
> +			return r;
>   	}
>   
>   	return amdgpu_cs_sync_rings(p);