Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb06d7ef authored by Tom St Denis's avatar Tom St Denis Committed by Alex Deucher
Browse files

drm/amd/powerplay: Unify family defines 



s/AMD_FAMILY_/AMDGPU_FAMILY_/

Signed-off-by: default avatarTom St Denis <tom.stdenis@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 40019dc4

drivers/gpu/drm/amd/include/amd_shared.h

+0 −9
Original line number Diff line number Diff line
@@ -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

 */

drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c

+3 −2
Original line number Diff line number Diff line
@@ -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);