Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98a36749 authored by Joe Perches's avatar Joe Perches Committed by Alex Deucher
Browse files

drivers/gpu: Convert remaining uses of pr_warning to pr_warn 



To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/gpu

Prior to this patch, there were 15 uses of pr_warning and
20 uses of pr_warn in drivers/gpu

Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarEdward O'Callaghan <funfunctor@folklore1984.net>
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6137a0fe

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

+1 −1
Original line number Diff line number Diff line
@@ -1544,7 +1544,7 @@ static int smu7_get_evv_voltages(struct pp_hwmgr *hwmgr) 
					if (vddc >= 2000 || vddc == 0)

						return -EINVAL;

				} else {

					pr_warning("failed to retrieving EVV voltage!\n");

					pr_warn("failed to retrieving EVV voltage!\n");

					continue;

				}

drivers/gpu/drm/amd/powerplay/inc/pp_debug.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#define PP_ASSERT_WITH_CODE(cond, msg, code)	\

	do {					\

		if (!(cond)) {			\

			pr_warning("%s\n", msg);	\

			pr_warn("%s\n", msg);	\

			code;			\

		}				\

	} while (0)

drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c

+2 −2
Original line number Diff line number Diff line
@@ -2205,7 +2205,7 @@ uint32_t fiji_get_offsetof(uint32_t type, uint32_t member) 
			return offsetof(SMU73_Discrete_DpmTable, LowSclkInterruptThreshold);

		}

	}

	pr_warning("can't get the offset of type %x member %x\n", type, member);

	pr_warn("can't get the offset of type %x member %x\n", type, member);

	return 0;

}
@@ -2230,7 +2230,7 @@ uint32_t fiji_get_mac_definition(uint32_t value) 
		return SMU73_MAX_LEVELS_MVDD;

	}



	pr_warning("can't get the mac of %x\n", value);

	pr_warn("can't get the mac of %x\n", value);

	return 0;

}

drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c

+7 −7
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void iceland_initialize_power_tune_defaults(struct pp_hwmgr *hwmgr) 
		break;

	default:

		smu_data->power_tune_defaults = &defaults_iceland;

		pr_warning("Unknown V.I. Device ID.\n");

		pr_warn("Unknown V.I. Device ID.\n");

		break;

	}

	return;
@@ -378,7 +378,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr, 
			return -EINVAL);



	if (NULL == hwmgr->dyn_state.cac_leakage_table) {

		pr_warning("CAC Leakage Table does not exist, using vddc.\n");

		pr_warn("CAC Leakage Table does not exist, using vddc.\n");

		return 0;

	}
@@ -394,7 +394,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr, 
				*lo = hwmgr->dyn_state.cac_leakage_table->entries[v_index].Vddc * VOLTAGE_SCALE;

				*hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[v_index].Leakage * VOLTAGE_SCALE);

			} else {

				pr_warning("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index, using maximum index from CAC table.\n");

				pr_warn("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index, using maximum index from CAC table.\n");

				*lo = hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Vddc * VOLTAGE_SCALE;

				*hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Leakage * VOLTAGE_SCALE);

			}
@@ -414,7 +414,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr, 
					*lo = hwmgr->dyn_state.cac_leakage_table->entries[v_index].Vddc * VOLTAGE_SCALE;

					*hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[v_index].Leakage) * VOLTAGE_SCALE;

				} else {

					pr_warning("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index in second look up, using maximum index from CAC table.");

					pr_warn("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index in second look up, using maximum index from CAC table.");

					*lo = hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Vddc * VOLTAGE_SCALE;

					*hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Leakage * VOLTAGE_SCALE);

				}
@@ -423,7 +423,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr, 
		}



		if (!vol_found)

			pr_warning("Unable to get std_vddc from SCLK/VDDC Dependency Table, using vddc.\n");

			pr_warn("Unable to get std_vddc from SCLK/VDDC Dependency Table, using vddc.\n");

	}



	return 0;
@@ -2146,7 +2146,7 @@ uint32_t iceland_get_offsetof(uint32_t type, uint32_t member) 
			return offsetof(SMU71_Discrete_DpmTable, LowSclkInterruptThreshold);

		}

	}

	pr_warning("can't get the offset of type %x member %x\n", type, member);

	pr_warn("can't get the offset of type %x member %x\n", type, member);

	return 0;

}
@@ -2169,7 +2169,7 @@ uint32_t iceland_get_mac_definition(uint32_t value) 
		return SMU71_MAX_LEVELS_MVDD;

	}



	pr_warning("can't get the mac of %x\n", value);

	pr_warn("can't get the mac of %x\n", value);

	return 0;

}

drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c

+2 −2
Original line number Diff line number Diff line
@@ -2223,7 +2223,7 @@ uint32_t polaris10_get_offsetof(uint32_t type, uint32_t member) 
			return offsetof(SMU74_Discrete_DpmTable, LowSclkInterruptThreshold);

		}

	}

	pr_warning("can't get the offset of type %x member %x\n", type, member);

	pr_warn("can't get the offset of type %x member %x\n", type, member);

	return 0;

}
@@ -2250,7 +2250,7 @@ uint32_t polaris10_get_mac_definition(uint32_t value) 
		return SMU7_UVD_MCLK_HANDSHAKE_DISABLE;

	}



	pr_warning("can't get the mac of %x\n", value);

	pr_warn("can't get the mac of %x\n", value);

	return 0;

}