tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm/amdgpu: simplify CZ/ST and KV/KB/ML checks

Just check for APU.

Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Alex Deucher e1ad2d53 70534d1e

+5 -5
+4 -4
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
··· 1699 1699 case CHIP_VEGAM: 1700 1700 case CHIP_CARRIZO: 1701 1701 case CHIP_STONEY: 1702 - if (adev->asic_type == CHIP_CARRIZO || adev->asic_type == CHIP_STONEY) 1702 + if (adev->flags & AMD_IS_APU) 1703 1703 adev->family = AMDGPU_FAMILY_CZ; 1704 1704 else 1705 1705 adev->family = AMDGPU_FAMILY_VI; ··· 1726 1726 case CHIP_KAVERI: 1727 1727 case CHIP_KABINI: 1728 1728 case CHIP_MULLINS: 1729 - if ((adev->asic_type == CHIP_BONAIRE) || (adev->asic_type == CHIP_HAWAII)) 1730 - adev->family = AMDGPU_FAMILY_CI; 1731 - else 1729 + if (adev->flags & AMD_IS_APU) 1732 1730 adev->family = AMDGPU_FAMILY_KV; 1731 + else 1732 + adev->family = AMDGPU_FAMILY_CI; 1733 1733 1734 1734 r = cik_set_ip_blocks(adev); 1735 1735 if (r)
+1 -1
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
··· 2342 2342 2343 2343 /* XXX need to determine what plls are available on each DCE11 part */ 2344 2344 pll_in_use = amdgpu_pll_get_use_mask(crtc); 2345 - if (adev->asic_type == CHIP_CARRIZO || adev->asic_type == CHIP_STONEY) { 2345 + if (adev->flags & AMD_IS_APU) { 2346 2346 if (!(pll_in_use & (1 << ATOM_PPLL1))) 2347 2347 return ATOM_PPLL1; 2348 2348 if (!(pll_in_use & (1 << ATOM_PPLL0)))