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

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

drm/amdgpu: use explicit limit for VRAM_CONTIGUOUS 



Split VRAM won't have a valid offset, so just set an explicit limit
when the flag is given to trigger reallocation if necessary.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarEdward O'Callaghan <funfunctor@folklore1984.net>
Tested-by: default avatarMike Lothian <mike@fireburn.co.uk>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 03f48dd5

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

+7 −2
Original line number Diff line number Diff line
@@ -121,12 +121,17 @@ static void amdgpu_ttm_placement_init(struct amdgpu_device *adev, 


	if (domain & AMDGPU_GEM_DOMAIN_VRAM) {

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

		unsigned lpfn = 0;



		/* This forces a reallocation if the flag wasn't set before */

		if (flags & AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS)

			lpfn = adev->mc.real_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;

			places[c].lpfn = 0;

			places[c].lpfn = lpfn;

			places[c].flags = TTM_PL_FLAG_WC |

				TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_VRAM |

				TTM_PL_FLAG_TOPDOWN;
@@ -134,7 +139,7 @@ static void amdgpu_ttm_placement_init(struct amdgpu_device *adev, 
		}



		places[c].fpfn = 0;

		places[c].lpfn = 0;

		places[c].lpfn = lpfn;

		places[c].flags = TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED |

			TTM_PL_FLAG_VRAM;

		if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED)