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>

diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h
index afbd8765dc73b701a2064f837bb5a128284b32a4..a74a0d2ff1cac6008be2b634184f9edc42185b10 100644 (file)
--- a/drivers/gpu/drm/amd/include/amd_shared.h
+++ b/drivers/gpu/drm/amd/include/amd_shared.h
@@ -25,15 +25,6 @@
 
 #define AMD_MAX_USEC_TIMEOUT           100000  /* 100 ms */
 
-/*
-* Supported GPU families (aligned with amdgpu_drm.h)
-*/
-#define AMD_FAMILY_UNKNOWN              0
-#define AMD_FAMILY_CI                   120 /* Bonaire, Hawaii */
-#define AMD_FAMILY_KV                   125 /* Kaveri, Kabini, Mullins */
-#define AMD_FAMILY_VI                   130 /* Iceland, Tonga */
-#define AMD_FAMILY_CZ                   135 /* Carrizo */
-
 /*
  * Supported ASIC types
  */

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
index 339a9361c5a51485de8e48b9dd966d3627d4e370..03b6128ebc203c66ad26cf2f2cb5f15786e08820 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
@@ -24,6 +24,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <drm/amdgpu_drm.h>
 #include "cgs_common.h"
 #include "power_state.h"
 #include "hwmgr.h"
@@ -61,10 +62,10 @@ int hwmgr_init(struct amd_pp_init *pp_init, struct pp_instance *handle)
        hwmgr->powercontainment_enabled = pp_init->powercontainment_enabled;
 
        switch (hwmgr->chip_family) {
-       case AMD_FAMILY_CZ:
+       case AMDGPU_FAMILY_CZ:
                cz_hwmgr_init(hwmgr);
                break;
-       case AMD_FAMILY_VI:
+       case AMDGPU_FAMILY_VI:
                switch (hwmgr->chip_id) {
                case CHIP_TONGA:
                        tonga_hwmgr_init(hwmgr);

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
index 0728c1e3d97a0137baf07466df1964a67f028b8e..7723473e51a073cea3365d0c9b32b4a211bd51bc 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
@@ -23,6 +23,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <drm/amdgpu_drm.h>
 #include "pp_instance.h"
 #include "smumgr.h"
 #include "cgs_common.h"
@@ -52,10 +53,10 @@ int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle)
        handle->smu_mgr = smumgr;
 
        switch (smumgr->chip_family) {
-       case AMD_FAMILY_CZ:
+       case AMDGPU_FAMILY_CZ:
                cz_smum_init(smumgr);
                break;
-       case AMD_FAMILY_VI:
+       case AMDGPU_FAMILY_VI:
                switch (smumgr->chip_id) {
                case CHIP_TONGA:
                        tonga_smum_init(smumgr);