aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2017-02-17 02:11:30 -0500
committerAlex Deucher <alexander.deucher@amd.com>2017-03-29 23:53:22 -0400
commit98a36749ebecdb4ac7e64815a62d002f8e2b971b (patch)
tree2fd77da4111b25edcc9e7e9697779d5e4c1c9d60 /drivers/gpu/drm
parent6137a0fec2910aca7eed03545b6f3557b5d95c14 (diff)
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: Christian König <christian.koenig@amd.com> Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net> Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c2
-rw-r--r--drivers/gpu/drm/amd/powerplay/inc/pp_debug.h2
-rw-r--r--drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c4
-rw-r--r--drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c14
-rw-r--r--drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c4
-rw-r--r--drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c4
6 files changed, 15 insertions, 15 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
index 13b35be3174c..320c705f2255 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
@@ -1544,7 +1544,7 @@ static int smu7_get_evv_voltages(struct pp_hwmgr *hwmgr)
1544 if (vddc >= 2000 || vddc == 0) 1544 if (vddc >= 2000 || vddc == 0)
1545 return -EINVAL; 1545 return -EINVAL;
1546 } else { 1546 } else {
1547 pr_warning("failed to retrieving EVV voltage!\n"); 1547 pr_warn("failed to retrieving EVV voltage!\n");
1548 continue; 1548 continue;
1549 } 1549 }
1550 1550
diff --git a/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h b/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h
index 072880130cfb..f3f9ebb631a5 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h
@@ -37,7 +37,7 @@
37#define PP_ASSERT_WITH_CODE(cond, msg, code) \ 37#define PP_ASSERT_WITH_CODE(cond, msg, code) \
38 do { \ 38 do { \
39 if (!(cond)) { \ 39 if (!(cond)) { \
40 pr_warning("%s\n", msg); \ 40 pr_warn("%s\n", msg); \
41 code; \ 41 code; \
42 } \ 42 } \
43 } while (0) 43 } while (0)
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
index 005e7d22c7b3..6a320b27aefd 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
@@ -2205,7 +2205,7 @@ uint32_t fiji_get_offsetof(uint32_t type, uint32_t member)
2205 return offsetof(SMU73_Discrete_DpmTable, LowSclkInterruptThreshold); 2205 return offsetof(SMU73_Discrete_DpmTable, LowSclkInterruptThreshold);
2206 } 2206 }
2207 } 2207 }
2208 pr_warning("can't get the offset of type %x member %x\n", type, member); 2208 pr_warn("can't get the offset of type %x member %x\n", type, member);
2209 return 0; 2209 return 0;
2210} 2210}
2211 2211
@@ -2230,7 +2230,7 @@ uint32_t fiji_get_mac_definition(uint32_t value)
2230 return SMU73_MAX_LEVELS_MVDD; 2230 return SMU73_MAX_LEVELS_MVDD;
2231 } 2231 }
2232 2232
2233 pr_warning("can't get the mac of %x\n", value); 2233 pr_warn("can't get the mac of %x\n", value);
2234 return 0; 2234 return 0;
2235} 2235}
2236 2236
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
index ad82161df831..51adf04ab4b3 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
@@ -122,7 +122,7 @@ static void iceland_initialize_power_tune_defaults(struct pp_hwmgr *hwmgr)
122 break; 122 break;
123 default: 123 default:
124 smu_data->power_tune_defaults = &defaults_iceland; 124 smu_data->power_tune_defaults = &defaults_iceland;
125 pr_warning("Unknown V.I. Device ID.\n"); 125 pr_warn("Unknown V.I. Device ID.\n");
126 break; 126 break;
127 } 127 }
128 return; 128 return;
@@ -378,7 +378,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
378 return -EINVAL); 378 return -EINVAL);
379 379
380 if (NULL == hwmgr->dyn_state.cac_leakage_table) { 380 if (NULL == hwmgr->dyn_state.cac_leakage_table) {
381 pr_warning("CAC Leakage Table does not exist, using vddc.\n"); 381 pr_warn("CAC Leakage Table does not exist, using vddc.\n");
382 return 0; 382 return 0;
383 } 383 }
384 384
@@ -394,7 +394,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
394 *lo = hwmgr->dyn_state.cac_leakage_table->entries[v_index].Vddc * VOLTAGE_SCALE; 394 *lo = hwmgr->dyn_state.cac_leakage_table->entries[v_index].Vddc * VOLTAGE_SCALE;
395 *hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[v_index].Leakage * VOLTAGE_SCALE); 395 *hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[v_index].Leakage * VOLTAGE_SCALE);
396 } else { 396 } else {
397 pr_warning("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index, using maximum index from CAC table.\n"); 397 pr_warn("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index, using maximum index from CAC table.\n");
398 *lo = hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Vddc * VOLTAGE_SCALE; 398 *lo = hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Vddc * VOLTAGE_SCALE;
399 *hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Leakage * VOLTAGE_SCALE); 399 *hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Leakage * VOLTAGE_SCALE);
400 } 400 }
@@ -414,7 +414,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
414 *lo = hwmgr->dyn_state.cac_leakage_table->entries[v_index].Vddc * VOLTAGE_SCALE; 414 *lo = hwmgr->dyn_state.cac_leakage_table->entries[v_index].Vddc * VOLTAGE_SCALE;
415 *hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[v_index].Leakage) * VOLTAGE_SCALE; 415 *hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[v_index].Leakage) * VOLTAGE_SCALE;
416 } else { 416 } else {
417 pr_warning("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index in second look up, using maximum index from CAC table."); 417 pr_warn("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index in second look up, using maximum index from CAC table.");
418 *lo = hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Vddc * VOLTAGE_SCALE; 418 *lo = hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Vddc * VOLTAGE_SCALE;
419 *hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Leakage * VOLTAGE_SCALE); 419 *hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Leakage * VOLTAGE_SCALE);
420 } 420 }
@@ -423,7 +423,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
423 } 423 }
424 424
425 if (!vol_found) 425 if (!vol_found)
426 pr_warning("Unable to get std_vddc from SCLK/VDDC Dependency Table, using vddc.\n"); 426 pr_warn("Unable to get std_vddc from SCLK/VDDC Dependency Table, using vddc.\n");
427 } 427 }
428 428
429 return 0; 429 return 0;
@@ -2146,7 +2146,7 @@ uint32_t iceland_get_offsetof(uint32_t type, uint32_t member)
2146 return offsetof(SMU71_Discrete_DpmTable, LowSclkInterruptThreshold); 2146 return offsetof(SMU71_Discrete_DpmTable, LowSclkInterruptThreshold);
2147 } 2147 }
2148 } 2148 }
2149 pr_warning("can't get the offset of type %x member %x\n", type, member); 2149 pr_warn("can't get the offset of type %x member %x\n", type, member);
2150 return 0; 2150 return 0;
2151} 2151}
2152 2152
@@ -2169,7 +2169,7 @@ uint32_t iceland_get_mac_definition(uint32_t value)
2169 return SMU71_MAX_LEVELS_MVDD; 2169 return SMU71_MAX_LEVELS_MVDD;
2170 } 2170 }
2171 2171
2172 pr_warning("can't get the mac of %x\n", value); 2172 pr_warn("can't get the mac of %x\n", value);
2173 return 0; 2173 return 0;
2174} 2174}
2175 2175
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
index 1eedab143aa9..f68e759e8be2 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
@@ -2223,7 +2223,7 @@ uint32_t polaris10_get_offsetof(uint32_t type, uint32_t member)
2223 return offsetof(SMU74_Discrete_DpmTable, LowSclkInterruptThreshold); 2223 return offsetof(SMU74_Discrete_DpmTable, LowSclkInterruptThreshold);
2224 } 2224 }
2225 } 2225 }
2226 pr_warning("can't get the offset of type %x member %x\n", type, member); 2226 pr_warn("can't get the offset of type %x member %x\n", type, member);
2227 return 0; 2227 return 0;
2228} 2228}
2229 2229
@@ -2250,7 +2250,7 @@ uint32_t polaris10_get_mac_definition(uint32_t value)
2250 return SMU7_UVD_MCLK_HANDSHAKE_DISABLE; 2250 return SMU7_UVD_MCLK_HANDSHAKE_DISABLE;
2251 } 2251 }
2252 2252
2253 pr_warning("can't get the mac of %x\n", value); 2253 pr_warn("can't get the mac of %x\n", value);
2254 return 0; 2254 return 0;
2255} 2255}
2256 2256
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
index 3491d1ae53cf..65d3a4893958 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
@@ -2695,7 +2695,7 @@ uint32_t tonga_get_offsetof(uint32_t type, uint32_t member)
2695 return offsetof(SMU72_Discrete_DpmTable, LowSclkInterruptThreshold); 2695 return offsetof(SMU72_Discrete_DpmTable, LowSclkInterruptThreshold);
2696 } 2696 }
2697 } 2697 }
2698 pr_warning("can't get the offset of type %x member %x\n", type, member); 2698 pr_warn("can't get the offset of type %x member %x\n", type, member);
2699 return 0; 2699 return 0;
2700} 2700}
2701 2701
@@ -2719,7 +2719,7 @@ uint32_t tonga_get_mac_definition(uint32_t value)
2719 case SMU_MAX_LEVELS_MVDD: 2719 case SMU_MAX_LEVELS_MVDD:
2720 return SMU72_MAX_LEVELS_MVDD; 2720 return SMU72_MAX_LEVELS_MVDD;
2721 } 2721 }
2722 pr_warning("can't get the mac value %x\n", value); 2722 pr_warn("can't get the mac value %x\n", value);
2723 2723
2724 return 0; 2724 return 0;
2725} 2725}