Commit 122805f3 authored by Michel Dänzer's avatar Michel Dänzer Committed by Wen Zhiwei
Browse files

drm/amdgpu: Handle NULL bo->tbo.resource (again) in amdgpu_vm_bo_update 

stable inclusion
from stable-v6.6.68
commit c226b0f0d8b00e26a4460260389150a74899b7bc
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBMDV1

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c226b0f0d8b00e26a4460260389150a74899b7bc

--------------------------------

commit 85230ee36d88e7a09fb062d43203035659dd10a5 upstream.

Third time's the charm, I hope?

Fixes: d3116756 ("drm/ttm: rename bo->mem and make it a pointer")
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3837


Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarMichel Dänzer <mdaenzer@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 695c2c745e5dff201b75da8a1d237ce403600d04)
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent c2cfa917

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

+3 −4
Original line number Diff line number Diff line
@@ -1161,10 +1161,9 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va, 
	 * next command submission.

	 */

	if (bo && bo->tbo.base.resv == vm->root.bo->tbo.base.resv) {

		uint32_t mem_type = bo->tbo.resource->mem_type;



		if (!(bo->preferred_domains &

		      amdgpu_mem_type_to_domain(mem_type)))

		if (bo->tbo.resource &&

		    !(bo->preferred_domains &

		      amdgpu_mem_type_to_domain(bo->tbo.resource->mem_type)))

			amdgpu_vm_bo_evicted(&bo_va->base);

		else

			amdgpu_vm_bo_idle(&bo_va->base);