Commit 70534d1e authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: simplify raven and renoir checks 



Just check for APU.

Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ac4e189a

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

+1 −2
Original line number Diff line number Diff line
@@ -1742,8 +1742,7 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) 
	case CHIP_RAVEN:

	case CHIP_ARCTURUS:

	case CHIP_RENOIR:

		if (adev->asic_type == CHIP_RAVEN ||

		    adev->asic_type == CHIP_RENOIR)

		if (adev->flags & AMD_IS_APU)

			adev->family = AMDGPU_FAMILY_RV;

		else

			adev->family = AMDGPU_FAMILY_AI;

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

+2 −2
Original line number Diff line number Diff line
@@ -1890,7 +1890,7 @@ static int gfx_v9_0_rlc_init(struct amdgpu_device *adev) 
			return r;

	}



	if (adev->asic_type == CHIP_RAVEN || adev->asic_type == CHIP_RENOIR) {

	if (adev->flags & AMD_IS_APU) {

		/* TODO: double check the cp_table_size for RV */

		adev->gfx.rlc.cp_table_size = ALIGN(96 * 5 * 4, 2048) + (64 * 1024); /* JT + GDS */

		r = amdgpu_gfx_rlc_init_cpt(adev);
@@ -2384,7 +2384,7 @@ static int gfx_v9_0_sw_fini(void *handle) 


	gfx_v9_0_mec_fini(adev);

	amdgpu_bo_unref(&adev->gfx.rlc.clear_state_obj);

	if (adev->asic_type == CHIP_RAVEN || adev->asic_type == CHIP_RENOIR) {

	if (adev->flags & AMD_IS_APU) {

		amdgpu_bo_free_kernel(&adev->gfx.rlc.cp_table_obj,

				&adev->gfx.rlc.cp_table_gpu_addr,

				(void **)&adev->gfx.rlc.cp_table_ptr);

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

+1 −1
Original line number Diff line number Diff line
@@ -1774,7 +1774,7 @@ static int sdma_v4_0_early_init(void *handle) 
	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	int r;



	if (adev->asic_type == CHIP_RAVEN || adev->asic_type == CHIP_RENOIR)

	if (adev->flags & AMD_IS_APU)

		adev->sdma.num_instances = 1;

	else if (adev->asic_type == CHIP_ARCTURUS)

		adev->sdma.num_instances = 8;

CRA Git | Maintained and supported by SUSTech CRA and CCSE