Commit 3f543552 authored by Yongqiang Sun's avatar Yongqiang Sun Committed by Alex Deucher
Browse files

drm/amdgpu: Merge get_reserved_allocation to get_vbios_allocations. 



Some ASICs need reserved memory for firmware or other components,
which is not allowed to be used by driver.
amdgpu_gmc_get_reserved_allocation is to handle additional areas.
To avoid any missing calling,
merged amdgpu_gmc_get_reserved_allocation to
amdgpu_gmc_get_vbios_allocations.

Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarYongqiang Sun <yongqiang.sun@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9527b9ca

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

+13 −19
Original line number Diff line number Diff line
@@ -622,6 +622,13 @@ void amdgpu_gmc_get_vbios_allocations(struct amdgpu_device *adev) 
{

	unsigned size;



	/*

	 * Some ASICs need to reserve a region of video memory to avoid access

	 * from driver

	 */

	adev->mman.stolen_reserved_offset = 0;

	adev->mman.stolen_reserved_size = 0;



	/*

	 * TODO:

	 * Currently there is a bug where some memory client outside
@@ -636,6 +643,12 @@ void amdgpu_gmc_get_vbios_allocations(struct amdgpu_device *adev) 
	case CHIP_RENOIR:

		adev->mman.keep_stolen_vga_memory = true;

		break;

	case CHIP_YELLOW_CARP:

		if (amdgpu_discovery == 0) {

			adev->mman.stolen_reserved_offset = 0x1ffb0000;

			adev->mman.stolen_reserved_size = 64 * PAGE_SIZE;

		}

		break;

	default:

		adev->mman.keep_stolen_vga_memory = false;

		break;
@@ -756,25 +769,6 @@ uint64_t amdgpu_gmc_vram_cpu_pa(struct amdgpu_device *adev, struct amdgpu_bo *bo 
	return amdgpu_bo_gpu_offset(bo) - adev->gmc.vram_start + adev->gmc.aper_base;

}



void amdgpu_gmc_get_reserved_allocation(struct amdgpu_device *adev)

{

	/* Some ASICs need to reserve a region of video memory to avoid access

	 * from driver */

	adev->mman.stolen_reserved_offset = 0;

	adev->mman.stolen_reserved_size = 0;



	switch (adev->asic_type) {

	case CHIP_YELLOW_CARP:

		if (amdgpu_discovery == 0) {

			adev->mman.stolen_reserved_offset = 0x1ffb0000;

			adev->mman.stolen_reserved_size = 64 * PAGE_SIZE;

		}

		break;

	default:

		break;

	}

}



int amdgpu_gmc_vram_checking(struct amdgpu_device *adev)

{

	struct amdgpu_bo *vram_bo = NULL;

drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h

+0 −1
Original line number Diff line number Diff line
@@ -331,7 +331,6 @@ amdgpu_gmc_set_vm_fault_masks(struct amdgpu_device *adev, int hub_type, 
			      bool enable);



void amdgpu_gmc_get_vbios_allocations(struct amdgpu_device *adev);

void amdgpu_gmc_get_reserved_allocation(struct amdgpu_device *adev);



void amdgpu_gmc_init_pdb0(struct amdgpu_device *adev);

uint64_t amdgpu_gmc_vram_mc2pa(struct amdgpu_device *adev, uint64_t mc_addr);

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

+0 −1
Original line number Diff line number Diff line
@@ -948,7 +948,6 @@ static int gmc_v10_0_sw_init(void *handle) 
		return r;



	amdgpu_gmc_get_vbios_allocations(adev);

	amdgpu_gmc_get_reserved_allocation(adev);



	/* Memory manager */

	r = amdgpu_bo_init(adev);