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

drm/amdgpu: apply top reserved VA space to pre Vega10 as well 



Reserve VA space at the top for older generations as well.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Acked-by: default avatarMonk Liu <monk.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 18d09e63

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

+1 −1
Original line number Diff line number Diff line
@@ -580,11 +580,11 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
			dev_info.ids_flags |= AMDGPU_IDS_FLAGS_PREEMPTION;



		vm_size = adev->vm_manager.max_pfn * AMDGPU_GPU_PAGE_SIZE;

		vm_size -= AMDGPU_VA_RESERVED_SIZE;

		dev_info.virtual_address_offset = AMDGPU_VA_RESERVED_SIZE;

		dev_info.virtual_address_max =

			min(vm_size, AMDGPU_VA_HOLE_START);



		vm_size -= AMDGPU_VA_RESERVED_SIZE;

		if (vm_size > AMDGPU_VA_HOLE_START) {

			dev_info.high_va_offset = AMDGPU_VA_HOLE_END;

			dev_info.high_va_max = AMDGPU_VA_HOLE_END | vm_size;

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

+2 −1
Original line number Diff line number Diff line
@@ -469,7 +469,8 @@ static void gmc_v6_0_set_prt(struct amdgpu_device *adev, bool enable) 


	if (enable) {

		uint32_t low = AMDGPU_VA_RESERVED_SIZE >> AMDGPU_GPU_PAGE_SHIFT;

		uint32_t high = adev->vm_manager.max_pfn;

		uint32_t high = adev->vm_manager.max_pfn -

			(AMDGPU_VA_RESERVED_SIZE >> AMDGPU_GPU_PAGE_SHIFT);



		WREG32(mmVM_PRT_APERTURE0_LOW_ADDR, low);

		WREG32(mmVM_PRT_APERTURE1_LOW_ADDR, low);

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

+2 −1
Original line number Diff line number Diff line
@@ -562,7 +562,8 @@ static void gmc_v7_0_set_prt(struct amdgpu_device *adev, bool enable) 


	if (enable) {

		uint32_t low = AMDGPU_VA_RESERVED_SIZE >> AMDGPU_GPU_PAGE_SHIFT;

		uint32_t high = adev->vm_manager.max_pfn;

		uint32_t high = adev->vm_manager.max_pfn -

			(AMDGPU_VA_RESERVED_SIZE >> AMDGPU_GPU_PAGE_SHIFT);



		WREG32(mmVM_PRT_APERTURE0_LOW_ADDR, low);

		WREG32(mmVM_PRT_APERTURE1_LOW_ADDR, low);

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

+2 −1
Original line number Diff line number Diff line
@@ -762,7 +762,8 @@ static void gmc_v8_0_set_prt(struct amdgpu_device *adev, bool enable) 


	if (enable) {

		uint32_t low = AMDGPU_VA_RESERVED_SIZE >> AMDGPU_GPU_PAGE_SHIFT;

		uint32_t high = adev->vm_manager.max_pfn;

		uint32_t high = adev->vm_manager.max_pfn -

			(AMDGPU_VA_RESERVED_SIZE >> AMDGPU_GPU_PAGE_SHIFT);



		WREG32(mmVM_PRT_APERTURE0_LOW_ADDR, low);

		WREG32(mmVM_PRT_APERTURE1_LOW_ADDR, low);

CRA Git | Maintained and supported by SUSTech CRA and CCSE