diff options
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 10 | 
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c index 49733c781717..fa0305e79c4a 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c @@ -1100,10 +1100,10 @@ int atomctrl_get_voltage_evv(struct pp_hwmgr *hwmgr,  		}  	} -	PP_ASSERT_WITH_CODE(entry_id < hwmgr->dyn_state.vddc_dependency_on_sclk->count, -	        "Can't find requested voltage id in vddc_dependency_on_sclk table!", +	if (entry_id >= hwmgr->dyn_state.vddc_dependency_on_sclk->count) { +	        pr_debug("Can't find requested voltage id in vddc_dependency_on_sclk table!\n");  	        return -EINVAL; -	); +	}  	get_voltage_info_param_space.ucVoltageType = VOLTAGE_TYPE_VDDC;  	get_voltage_info_param_space.ucVoltageMode = ATOM_GET_VOLTAGE_EVV_VOLTAGE; diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c index 03075c6ac512..264e98f4f955 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c @@ -1543,7 +1543,7 @@ static int smu7_get_evv_voltages(struct pp_hwmgr *hwmgr)  					if (vddc >= 2000 || vddc == 0)  						return -EINVAL;  				} else { -					pr_warn("failed to retrieving EVV voltage!\n"); +					pr_debug("failed to retrieving EVV voltage!\n");  					continue;  				} @@ -3026,11 +3026,11 @@ static int smu7_get_pp_table_entry_v1(struct pp_hwmgr *hwmgr,  	if (dep_mclk_table != NULL && dep_mclk_table->count == 1) {  		if (dep_mclk_table->entries[0].clk !=  				data->vbios_boot_state.mclk_bootup_value) -			pr_err("Single MCLK entry VDDCI/MCLK dependency table " +			pr_debug("Single MCLK entry VDDCI/MCLK dependency table "  					"does not match VBIOS boot MCLK level");  		if (dep_mclk_table->entries[0].vddci !=  				data->vbios_boot_state.vddci_bootup_value) -			pr_err("Single VDDCI entry VDDCI/MCLK dependency table " +			pr_debug("Single VDDCI entry VDDCI/MCLK dependency table "  					"does not match VBIOS boot VDDCI level");  	} @@ -3174,11 +3174,11 @@ static int smu7_get_pp_table_entry_v0(struct pp_hwmgr *hwmgr,  	if (dep_mclk_table != NULL && dep_mclk_table->count == 1) {  		if (dep_mclk_table->entries[0].clk !=  				data->vbios_boot_state.mclk_bootup_value) -			pr_err("Single MCLK entry VDDCI/MCLK dependency table " +			pr_debug("Single MCLK entry VDDCI/MCLK dependency table "  					"does not match VBIOS boot MCLK level");  		if (dep_mclk_table->entries[0].v !=  				data->vbios_boot_state.vddci_bootup_value) -			pr_err("Single VDDCI entry VDDCI/MCLK dependency table " +			pr_debug("Single VDDCI entry VDDCI/MCLK dependency table "  					"does not match VBIOS boot VDDCI level");  	}  | 
