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

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

drm/amdgpu: stop adding dummy entry in amdgpu_ttm_placement_init 



AMDGPU_GEM_CREATE_NO_CPU_ACCESS and AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED are
obviously mutual exclusive. So stop adding a dummy entry without effect when
both are specified.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent faceaf6a

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

+3 −5
Original line number Diff line number Diff line
@@ -119,17 +119,15 @@ static void amdgpu_ttm_placement_init(struct amdgpu_device *adev, 
				      struct ttm_place *places,

				      u32 domain, u64 flags)

{

	u32 c = 0, i;

	u32 c = 0;



	if (domain & AMDGPU_GEM_DOMAIN_VRAM) {

		unsigned visible_pfn = adev->mc.visible_vram_size >> PAGE_SHIFT;



		if (flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS &&

		    !(flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) &&

		    adev->mc.visible_vram_size < adev->mc.real_vram_size) {

			places[c].fpfn = visible_pfn;

			if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED)

				places[c].lpfn = visible_pfn;

			else

			places[c].lpfn = 0;

			places[c].flags = TTM_PL_FLAG_WC |

				TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_VRAM |