Commit 48e9fbd1 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: initialize the vmid_wait with the stub fence 



This way we don't need to check for NULL any more.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6103b2f2

drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,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);

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c

+1 −0
Original line number Diff line number Diff line
@@ -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;