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

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

drm/amdgpu: fix error handling in amdgpu_bo_do_create 



The bo structure is freed up in case of an error, so we can't do any
accounting if that happens.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
CC: stable@vger.kernel.org
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4d98e5ee

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

+3 −3
Original line number Diff line number Diff line
@@ -369,6 +369,9 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, 
	r = ttm_bo_init_reserved(&adev->mman.bdev, &bo->tbo, size, type,

				 &bo->placement, page_align, !kernel, NULL,

				 acc_size, sg, resv, &amdgpu_ttm_bo_destroy);

	if (unlikely(r != 0))

		return r;



	bytes_moved = atomic64_read(&adev->num_bytes_moved) -

		      initial_bytes_moved;

	if (adev->mc.visible_vram_size < adev->mc.real_vram_size &&
@@ -378,9 +381,6 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, 
	else

		amdgpu_cs_report_moved_bytes(adev, bytes_moved, 0);



	if (unlikely(r != 0))

		return r;



	if (kernel)

		bo->tbo.priority = 1;