Commit 355d991c authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr on unsupported ASICs 



Otherwise, the error message prompted will confuse user.

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>
Cc: stable@vger.kernel.org
parent 9ea3fa72

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

+18 −5
Original line number Diff line number Diff line
@@ -3478,18 +3478,31 @@ static int smu7_get_pp_table_entry(struct pp_hwmgr *hwmgr, 


static int smu7_get_gpu_power(struct pp_hwmgr *hwmgr, u32 *query)

{

	struct amdgpu_device *adev = hwmgr->adev;

	int i;

	u32 tmp = 0;



	if (!query)

		return -EINVAL;



	/*

	 * PPSMC_MSG_GetCurrPkgPwr is not supported on:

	 *  - Hawaii

	 *  - Bonaire

	 *  - Fiji

	 *  - Tonga

	 */

	if ((adev->asic_type != CHIP_HAWAII) &&

	    (adev->asic_type != CHIP_BONAIRE) &&

	    (adev->asic_type != CHIP_FIJI) &&

	    (adev->asic_type != CHIP_TONGA)) {

		smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_GetCurrPkgPwr, 0);

		tmp = cgs_read_register(hwmgr->device, mmSMC_MSG_ARG_0);

		*query = tmp;



		if (tmp != 0)

			return 0;

	}



	smum_send_msg_to_smc(hwmgr, PPSMC_MSG_PmStatusLogStart);

	cgs_write_ind_register(hwmgr->device, CGS_IND_REG__SMC,

CRA Git | Maintained and supported by SUSTech CRA and CCSE