Unverified Commit 7e10ffab authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11964 drm/amd/pm: Fix negative array index read 

Merge Pull Request from: @ci-robot 
 
PR sync from: Tengda Wu <wutengda2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/QGR25U6VSZOLT2P6L3EF42XN63MYO4EP/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAU9MO 
 
Link:https://gitee.com/openeuler/kernel/pulls/11964

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 9073507a 38894948

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

+16 −5
Original line number Diff line number Diff line
@@ -900,19 +900,22 @@ static int navi10_get_current_clk_freq_by_table(struct smu_context *smu, 
					   value);

}



static bool navi10_is_support_fine_grained_dpm(struct smu_context *smu, enum smu_clk_type clk_type)

static int navi10_is_support_fine_grained_dpm(struct smu_context *smu, enum smu_clk_type clk_type)

{

	PPTable_t *pptable = smu->smu_table.driver_pptable;

	DpmDescriptor_t *dpm_desc = NULL;

	uint32_t clk_index = 0;

	int clk_index = 0;



	clk_index = smu_cmn_to_asic_specific_index(smu,

						   CMN2ASIC_MAPPING_CLK,

						   clk_type);

	if (clk_index < 0)

		return clk_index;



	dpm_desc = &pptable->DpmDescriptor[clk_index];



	/* 0 - Fine grained DPM, 1 - Discrete DPM */

	return dpm_desc->SnapToDiscrete == 0 ? true : false;

	return dpm_desc->SnapToDiscrete == 0 ? 1 : 0;

}



static inline bool navi10_od_feature_is_supported(struct smu_11_0_overdrive_table *od_table, enum SMU_11_0_ODFEATURE_CAP cap)
@@ -964,7 +967,11 @@ static int navi10_print_clk_levels(struct smu_context *smu, 
		if (ret)

			return size;



		if (!navi10_is_support_fine_grained_dpm(smu, clk_type)) {

		ret = navi10_is_support_fine_grained_dpm(smu, clk_type);

		if (ret < 0)

			return ret;



		if (!ret) {

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

				ret = smu_v11_0_get_dpm_freq_by_index(smu, clk_type, i, &value);

				if (ret)
@@ -1127,7 +1134,11 @@ static int navi10_force_clk_levels(struct smu_context *smu, 
	case SMU_UCLK:

	case SMU_FCLK:

		/* There is only 2 levels for fine grained DPM */

		if (navi10_is_support_fine_grained_dpm(smu, clk_type)) {

		ret = navi10_is_support_fine_grained_dpm(smu, clk_type);

		if (ret < 0)

			return ret;



		if (ret) {

			soft_max_level = (soft_max_level >= 1 ? 1 : 0);

			soft_min_level = (soft_min_level >= 1 ? 1 : 0);

		}