Commit e1ad2d53 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: simplify CZ/ST and KV/KB/ML 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 70534d1e

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

+4 −4
Original line number Diff line number Diff line
@@ -1699,7 +1699,7 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) 
	case CHIP_VEGAM:

	case CHIP_CARRIZO:

	case CHIP_STONEY:

		if (adev->asic_type == CHIP_CARRIZO || adev->asic_type == CHIP_STONEY)

		if (adev->flags & AMD_IS_APU)

			adev->family = AMDGPU_FAMILY_CZ;

		else

			adev->family = AMDGPU_FAMILY_VI;
@@ -1726,10 +1726,10 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) 
	case CHIP_KAVERI:

	case CHIP_KABINI:

	case CHIP_MULLINS:

		if ((adev->asic_type == CHIP_BONAIRE) || (adev->asic_type == CHIP_HAWAII))

			adev->family = AMDGPU_FAMILY_CI;

		else

		if (adev->flags & AMD_IS_APU)

			adev->family = AMDGPU_FAMILY_KV;

		else

			adev->family = AMDGPU_FAMILY_CI;



		r = cik_set_ip_blocks(adev);

		if (r)

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

+1 −1
Original line number Diff line number Diff line
@@ -2342,7 +2342,7 @@ static u32 dce_v11_0_pick_pll(struct drm_crtc *crtc) 


	/* XXX need to determine what plls are available on each DCE11 part */

	pll_in_use = amdgpu_pll_get_use_mask(crtc);

	if (adev->asic_type == CHIP_CARRIZO || adev->asic_type == CHIP_STONEY) {

	if (adev->flags & AMD_IS_APU) {

		if (!(pll_in_use & (1 << ATOM_PPLL1)))

			return ATOM_PPLL1;

		if (!(pll_in_use & (1 << ATOM_PPLL0)))

CRA Git | Maintained and supported by SUSTech CRA and CCSE