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

drm/amdgpu: fix check in gmc_v9_0_get_vm_pte() 



The coherency flags can only be determined when the BO is locked and that
in turn is only guaranteed when the mapping is validated.

Fix the check, move the resource check into the function and add an assert
that the BO is locked.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Fixes: d1a372af ("drm/amdgpu: Set MTYPE in PTE based on BO flags")
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d4be16cc

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

+8 −5
Original line number Diff line number Diff line
@@ -1130,8 +1130,10 @@ static void gmc_v9_0_get_coherence_flags(struct amdgpu_device *adev, 
					 uint64_t *flags)

{

	struct amdgpu_device *bo_adev = amdgpu_ttm_adev(bo->tbo.bdev);

	bool is_vram = bo->tbo.resource->mem_type == TTM_PL_VRAM;

	bool coherent = bo->flags & (AMDGPU_GEM_CREATE_COHERENT | AMDGPU_GEM_CREATE_EXT_COHERENT);

	bool is_vram = bo->tbo.resource &&

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

	bool coherent = bo->flags & (AMDGPU_GEM_CREATE_COHERENT |

				     AMDGPU_GEM_CREATE_EXT_COHERENT);

	bool ext_coherent = bo->flags & AMDGPU_GEM_CREATE_EXT_COHERENT;

	bool uncached = bo->flags & AMDGPU_GEM_CREATE_UNCACHED;

	struct amdgpu_vm *vm = mapping->bo_va->base.vm;
@@ -1139,6 +1141,8 @@ static void gmc_v9_0_get_coherence_flags(struct amdgpu_device *adev, 
	bool snoop = false;

	bool is_local;



	dma_resv_assert_held(bo->tbo.base.resv);



	switch (amdgpu_ip_version(adev, GC_HWIP, 0)) {

	case IP_VERSION(9, 4, 1):

	case IP_VERSION(9, 4, 2):
@@ -1257,9 +1261,8 @@ static void gmc_v9_0_get_vm_pte(struct amdgpu_device *adev, 
		*flags &= ~AMDGPU_PTE_VALID;

	}



	if (bo && bo->tbo.resource)

		gmc_v9_0_get_coherence_flags(adev, mapping->bo_va->base.bo,

					     mapping, flags);

	if ((*flags & AMDGPU_PTE_VALID) && bo)

		gmc_v9_0_get_coherence_flags(adev, bo, mapping, flags);

}



static void gmc_v9_0_override_vm_pte_flags(struct amdgpu_device *adev,