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

Commit 6f5d29ff authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/powerplay: add ECC feature bit 



It's OK to have this feature bit with old SMU firmwares.
But the feature should be disabled on them.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ad51c46e

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

+9 −1
Original line number Diff line number Diff line
@@ -91,6 +91,12 @@ static void vega20_set_default_registry_data(struct pp_hwmgr *hwmgr) 
	 *   MP0CLK DS

	 */

	data->registry_data.disallowed_features = 0xE0041C00;

	/* ECC feature should be disabled on old SMUs */

	smum_send_msg_to_smc(hwmgr, PPSMC_MSG_GetSmuVersion);

	hwmgr->smu_version = smum_get_argument(hwmgr);

	if (hwmgr->smu_version < 0x282100)

		data->registry_data.disallowed_features |= FEATURE_ECC_MASK;



	data->registry_data.od_state_in_dc_support = 0;

	data->registry_data.thermal_support = 1;

	data->registry_data.skip_baco_hardware = 0;
@@ -357,6 +363,7 @@ static void vega20_init_dpm_defaults(struct pp_hwmgr *hwmgr) 
	data->smu_features[GNLD_DS_MP1CLK].smu_feature_id = FEATURE_DS_MP1CLK_BIT;

	data->smu_features[GNLD_DS_MP0CLK].smu_feature_id = FEATURE_DS_MP0CLK_BIT;

	data->smu_features[GNLD_XGMI].smu_feature_id = FEATURE_XGMI_BIT;

	data->smu_features[GNLD_ECC].smu_feature_id = FEATURE_ECC_BIT;



	for (i = 0; i < GNLD_FEATURES_MAX; i++) {

		data->smu_features[i].smu_feature_bitmap =
@@ -3020,7 +3027,8 @@ static int vega20_get_ppfeature_status(struct pp_hwmgr *hwmgr, char *buf) 
				"FCLK_DS",

				"MP1CLK_DS",

				"MP0CLK_DS",

				"XGMI"};

				"XGMI",

				"ECC"};

	static const char *output_title[] = {

				"FEATURES",

				"BITMASK",

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ enum { 
	GNLD_DS_MP1CLK,

	GNLD_DS_MP0CLK,

	GNLD_XGMI,

	GNLD_ECC,



	GNLD_FEATURES_MAX

};

drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if.h

+2 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 
#define FEATURE_DS_MP1CLK_BIT           30

#define FEATURE_DS_MP0CLK_BIT           31

#define FEATURE_XGMI_BIT                32

#define FEATURE_SPARE_33_BIT            33

#define FEATURE_ECC_BIT                 33

#define FEATURE_SPARE_34_BIT            34

#define FEATURE_SPARE_35_BIT            35

#define FEATURE_SPARE_36_BIT            36
@@ -166,6 +166,7 @@ 
#define FEATURE_DS_MP1CLK_MASK          (1 << FEATURE_DS_MP1CLK_BIT          )

#define FEATURE_DS_MP0CLK_MASK          (1 << FEATURE_DS_MP0CLK_BIT          )

#define FEATURE_XGMI_MASK               (1 << FEATURE_XGMI_BIT               )

#define FEATURE_ECC_MASK                (1ULL << FEATURE_ECC_BIT                )



#define DPM_OVERRIDE_DISABLE_SOCCLK_PID             0x00000001

#define DPM_OVERRIDE_DISABLE_UCLK_PID               0x00000002