[PATCH 08/10] drm/amdgpu: initialize the vmid_wait with the stub fence

[Andrey Grodzovsky]

Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky at amd.com>

Andrey

On 2022-03-03 03:23, Christian König wrote:
> This way we don't need to check for NULL any more.
>
> Signed-off-by: Christian König <christian.koenig at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c  | 2 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 1 +
>   2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
> index ddf46802b1ff..4ba4b54092f1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
> @@ -188,7 +188,7 @@ static int amdgpu_vmid_grab_idle(struct amdgpu_vm *vm,
>   	unsigned i;
>   	int r;
>   
> -	if (ring->vmid_wait && !dma_fence_is_signaled(ring->vmid_wait))
> +	if (!dma_fence_is_signaled(ring->vmid_wait))
>   		return amdgpu_sync_fence(sync, ring->vmid_wait);
>   
>   	fences = kmalloc_array(id_mgr->num_ids, sizeof(void *), GFP_KERNEL);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> index 35bcb6dc1816..7f33ae87cb41 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> @@ -193,6 +193,7 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
>   		adev->rings[ring->idx] = ring;
>   		ring->num_hw_submission = sched_hw_submission;
>   		ring->sched_score = sched_score;
> +		ring->vmid_wait = dma_fence_get_stub();
>   		r = amdgpu_fence_driver_init_ring(ring);
>   		if (r)
>   			return r;