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

drm/amd/powerplay: Unify family defines

s/AMD_FAMILY_/AMDGPU_FAMILY_/

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Tom St Denis and committed by
Alex Deucher
bb06d7ef 40019dc4

+6 -13
-9
drivers/gpu/drm/amd/include/amd_shared.h
··· 26 26 #define AMD_MAX_USEC_TIMEOUT 100000 /* 100 ms */ 27 27 28 28 /* 29 - * Supported GPU families (aligned with amdgpu_drm.h) 30 - */ 31 - #define AMD_FAMILY_UNKNOWN 0 32 - #define AMD_FAMILY_CI 120 /* Bonaire, Hawaii */ 33 - #define AMD_FAMILY_KV 125 /* Kaveri, Kabini, Mullins */ 34 - #define AMD_FAMILY_VI 130 /* Iceland, Tonga */ 35 - #define AMD_FAMILY_CZ 135 /* Carrizo */ 36 - 37 - /* 38 29 * Supported ASIC types 39 30 */ 40 31 enum amd_asic_type {
+3 -2
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
··· 24 24 #include <linux/types.h> 25 25 #include <linux/kernel.h> 26 26 #include <linux/slab.h> 27 + #include <drm/amdgpu_drm.h> 27 28 #include "cgs_common.h" 28 29 #include "power_state.h" 29 30 #include "hwmgr.h" ··· 62 61 hwmgr->powercontainment_enabled = pp_init->powercontainment_enabled; 63 62 64 63 switch (hwmgr->chip_family) { 65 - case AMD_FAMILY_CZ: 64 + case AMDGPU_FAMILY_CZ: 66 65 cz_hwmgr_init(hwmgr); 67 66 break; 68 - case AMD_FAMILY_VI: 67 + case AMDGPU_FAMILY_VI: 69 68 switch (hwmgr->chip_id) { 70 69 case CHIP_TONGA: 71 70 tonga_hwmgr_init(hwmgr);
+3 -2
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
··· 23 23 #include <linux/types.h> 24 24 #include <linux/kernel.h> 25 25 #include <linux/slab.h> 26 + #include <drm/amdgpu_drm.h> 26 27 #include "pp_instance.h" 27 28 #include "smumgr.h" 28 29 #include "cgs_common.h" ··· 53 52 handle->smu_mgr = smumgr; 54 53 55 54 switch (smumgr->chip_family) { 56 - case AMD_FAMILY_CZ: 55 + case AMDGPU_FAMILY_CZ: 57 56 cz_smum_init(smumgr); 58 57 break; 59 - case AMD_FAMILY_VI: 58 + case AMDGPU_FAMILY_VI: 60 59 switch (smumgr->chip_id) { 61 60 case CHIP_TONGA: 62 61 tonga_smum_init(smumgr);