Commit 1a0b713c authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/pm: correct MGpuFanBoost setting 

No MGpuFanBoost setting for those ASICs which do not support it.
Otherwise, it may breaks their fan control feature.

Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1580



Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarKenneth Feng <kenneth.feng@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent a2b4785f

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c

+9 −0
Original line number Diff line number Diff line
@@ -2925,6 +2925,8 @@ static ssize_t navi1x_get_gpu_metrics(struct smu_context *smu, 


static int navi10_enable_mgpu_fan_boost(struct smu_context *smu)

{

	struct smu_table_context *table_context = &smu->smu_table;

	PPTable_t *smc_pptable = table_context->driver_pptable;

	struct amdgpu_device *adev = smu->adev;

	uint32_t param = 0;
@@ -2932,6 +2934,13 @@ static int navi10_enable_mgpu_fan_boost(struct smu_context *smu) 
	if (adev->asic_type == CHIP_NAVI12)

		return 0;



	/*

	 * Skip the MGpuFanBoost setting for those ASICs

	 * which do not support it

	 */

	if (!smc_pptable->MGpuFanBoostLimitRpm)

		return 0;



	/* Workaround for WS SKU */

	if (adev->pdev->device == 0x7312 &&

	    adev->pdev->revision == 0)

drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c

+10 −0
Original line number Diff line number Diff line
@@ -3027,6 +3027,16 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu, 


static int sienna_cichlid_enable_mgpu_fan_boost(struct smu_context *smu)

{

	struct smu_table_context *table_context = &smu->smu_table;

	PPTable_t *smc_pptable = table_context->driver_pptable;



	/*

	 * Skip the MGpuFanBoost setting for those ASICs

	 * which do not support it

	 */

	if (!smc_pptable->MGpuFanBoostLimitRpm)

		return 0;



	return smu_cmn_send_smc_msg_with_param(smu,

					       SMU_MSG_SetMGpuFanBoostLimitRpm,

					       0,