Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22a77cf6 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: cleanup hw reference handling in the IB tests 



Reference should be taken when we make the assignment, not anywhere else.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 08086635

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

+1 −5
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
	bool skip_preamble, need_ctx_switch;

	unsigned patch_offset = ~0;

	struct amdgpu_vm *vm;

	struct fence *hwf;

	uint64_t ctx;



	unsigned i;
@@ -190,7 +189,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
	if (ring->funcs->emit_hdp_invalidate)

		amdgpu_ring_emit_hdp_invalidate(ring);



	r = amdgpu_fence_emit(ring, &hwf);

	r = amdgpu_fence_emit(ring, f);

	if (r) {

		dev_err(adev->dev, "failed to emit fence (%d)\n", r);

		if (job && job->vm_id)
@@ -205,9 +204,6 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
				       AMDGPU_FENCE_FLAG_64BIT);

	}



	if (f)

		*f = fence_get(hwf);



	if (patch_offset != ~0 && ring->funcs->patch_cond_exec)

		amdgpu_ring_patch_cond_exec(ring, patch_offset);

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

+3 −5
Original line number Diff line number Diff line
@@ -172,15 +172,13 @@ static struct fence *amdgpu_job_run(struct amd_sched_job *sched_job) 
	trace_amdgpu_sched_run_job(job);

	r = amdgpu_ib_schedule(job->ring, job->num_ibs, job->ibs,

			       job->sync.last_vm_update, job, &fence);

	if (r) {

	if (r)

		DRM_ERROR("Error scheduling IBs (%d)\n", r);

		goto err;

	}



err:

	/* if gpu reset, hw fence will be replaced here */

	fence_put(job->fence);

	job->fence = fence;

	job->fence = fence_get(fence);

	amdgpu_job_free_resources(job);

	return fence;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -968,7 +968,7 @@ static int amdgpu_uvd_send_msg(struct amdgpu_ring *ring, struct amdgpu_bo *bo, 


	if (direct) {

		r = amdgpu_ib_schedule(ring, 1, ib, NULL, NULL, &f);

		job->fence = f;

		job->fence = fence_get(f);

		if (r)

			goto err_free;

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

+2 −2
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ int amdgpu_vce_get_create_msg(struct amdgpu_ring *ring, uint32_t handle, 
		ib->ptr[i] = 0x0;



	r = amdgpu_ib_schedule(ring, 1, ib, NULL, NULL, &f);

	job->fence = f;

	job->fence = fence_get(f);

	if (r)

		goto err;
@@ -494,7 +494,7 @@ int amdgpu_vce_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle, 


	if (direct) {

		r = amdgpu_ib_schedule(ring, 1, ib, NULL, NULL, &f);

		job->fence = f;

		job->fence = fence_get(f);

		if (r)

			goto err;

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

+0 −1
Original line number Diff line number Diff line
@@ -675,7 +675,6 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring) 
	}



err1:

	fence_put(f);

	amdgpu_ib_free(adev, &ib, NULL);

	fence_put(f);

err0: