Commit e1a4b67a authored by xinhui pan's avatar xinhui pan Committed by Alex Deucher
Browse files

drm/amdgpu: Fix a false positive when pin non-VRAM memory 



Flag TTM_PL_FLAG_CONTIGUOUS is only valid for VRAM domain. So fix the
false positive by checking memory type too.

Suggested-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarxinhui pan <xinhui.pan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b131c363

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

+2 −1
Original line number Diff line number Diff line
@@ -916,7 +916,8 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, 
		if (!(domain & amdgpu_mem_type_to_domain(mem_type)))

			return -EINVAL;



		if ((bo->flags & AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS) &&

		if ((mem_type == TTM_PL_VRAM) &&

		    (bo->flags & AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS) &&

		    !(mem_flags & TTM_PL_FLAG_CONTIGUOUS))

			return -EINVAL;