Commit 7f95a2e0 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/pm: drop arb table first byte workaround 



As this is not needed for polaris.

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

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

+0 −31
Original line number Diff line number Diff line
@@ -1865,33 +1865,6 @@ static int polaris10_populate_avfs_parameters(struct pp_hwmgr *hwmgr) 
	return result;

}



static int polaris10_init_arb_table_index(struct pp_hwmgr *hwmgr)

{

	struct polaris10_smumgr *smu_data = (struct polaris10_smumgr *)(hwmgr->smu_backend);

	uint32_t tmp;

	int result;



	/* This is a read-modify-write on the first byte of the ARB table.

	 * The first byte in the SMU73_Discrete_MCArbDramTimingTable structure

	 * is the field 'current'.

	 * This solution is ugly, but we never write the whole table only

	 * individual fields in it.

	 * In reality this field should not be in that structure

	 * but in a soft register.

	 */

	result = smu7_read_smc_sram_dword(hwmgr,

			smu_data->smu7_data.arb_table_start, &tmp, SMC_RAM_END);



	if (result)

		return result;



	tmp &= 0x00FFFFFF;

	tmp |= ((uint32_t)MC_CG_ARB_FREQ_F1) << 24;



	return smu7_write_smc_sram_dword(hwmgr,

			smu_data->smu7_data.arb_table_start, tmp, SMC_RAM_END);

}



static void polaris10_initialize_power_tune_defaults(struct pp_hwmgr *hwmgr)

{

	struct polaris10_smumgr *smu_data = (struct polaris10_smumgr *)(hwmgr->smu_backend);
@@ -2118,10 +2091,6 @@ static int polaris10_init_smc_table(struct pp_hwmgr *hwmgr) 
	PP_ASSERT_WITH_CODE(0 == result,

			"Failed to upload dpm data to SMC memory!", return result);



	result = polaris10_init_arb_table_index(hwmgr);

	PP_ASSERT_WITH_CODE(0 == result,

			"Failed to upload arb data to SMC memory!", return result);



	result = polaris10_populate_pm_fuses(hwmgr);

	PP_ASSERT_WITH_CODE(0 == result,

			"Failed to  populate PM fuses to SMC memory!", return result);