Commit bc0515ec authored by Pierre-Eric Pelloux-Prayer's avatar Pierre-Eric Pelloux-Prayer Committed by Alex Deucher
Browse files

drm/amdgpu: fix error handling in amdgpu_copy_buffer 



drm_sched_job_add_resv_dependencies can fail in amdgpu_ttm_prepare_job.
In this case we need to use amdgpu_job_free to release memory.

---
v4: moved job pointer clearing to a different patchset
---

Signed-off-by: default avatarPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 582c65e8

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

+2 −4
Original line number Diff line number Diff line
@@ -2393,7 +2393,7 @@ int amdgpu_copy_buffer(struct amdgpu_device *adev, uint64_t src_offset, 
				   resv, vm_needs_flush, &job, false,

				   AMDGPU_KERNEL_JOB_ID_TTM_COPY_BUFFER);

	if (r)

		return r;

		goto error_free;



	for (i = 0; i < num_loops; i++) {

		uint32_t cur_size_in_bytes = min(byte_count, max_bytes);
@@ -2405,11 +2405,9 @@ int amdgpu_copy_buffer(struct amdgpu_device *adev, uint64_t src_offset, 
		byte_count -= cur_size_in_bytes;

	}



	if (r)

		goto error_free;

	*fence = amdgpu_ttm_job_submit(adev, job, num_dw);



	return r;

	return 0;



error_free:

	amdgpu_job_free(job);