Skip to content

Commit cea3031

Browse files
superm1alexdeucher
authored andcommitted
drm/amd: Change kv-dpm DRM_*() macros to drm_*()
drm_*() macros can show the device a message came from. Reviewed-by: Lijo Lazar <lijo.lazar@amd.com> Cc: Alexandre Demers <alexandre.f.demers@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Link: https://lore.kernel.org/r/20250627143432.3222843-3-superm1@kernel.org Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 7951cc1 commit cea3031

1 file changed

Lines changed: 28 additions & 28 deletions

File tree

  • drivers/gpu/drm/amd/pm/legacy-dpm

drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,7 @@ static void kv_dpm_enable_bapm(void *handle, bool enable)
12421242
if (pi->bapm_enable) {
12431243
ret = amdgpu_kv_smc_bapm_enable(adev, enable);
12441244
if (ret)
1245-
DRM_ERROR("amdgpu_kv_smc_bapm_enable failed\n");
1245+
drm_err(adev_to_drm(adev), "amdgpu_kv_smc_bapm_enable failed\n");
12461246
}
12471247
}
12481248

@@ -1266,40 +1266,40 @@ static int kv_dpm_enable(struct amdgpu_device *adev)
12661266

12671267
ret = kv_process_firmware_header(adev);
12681268
if (ret) {
1269-
DRM_ERROR("kv_process_firmware_header failed\n");
1269+
drm_err(adev_to_drm(adev), "kv_process_firmware_header failed\n");
12701270
return ret;
12711271
}
12721272
kv_init_fps_limits(adev);
12731273
kv_init_graphics_levels(adev);
12741274
ret = kv_program_bootup_state(adev);
12751275
if (ret) {
1276-
DRM_ERROR("kv_program_bootup_state failed\n");
1276+
drm_err(adev_to_drm(adev), "kv_program_bootup_state failed\n");
12771277
return ret;
12781278
}
12791279
kv_calculate_dfs_bypass_settings(adev);
12801280
ret = kv_upload_dpm_settings(adev);
12811281
if (ret) {
1282-
DRM_ERROR("kv_upload_dpm_settings failed\n");
1282+
drm_err(adev_to_drm(adev), "kv_upload_dpm_settings failed\n");
12831283
return ret;
12841284
}
12851285
ret = kv_populate_uvd_table(adev);
12861286
if (ret) {
1287-
DRM_ERROR("kv_populate_uvd_table failed\n");
1287+
drm_err(adev_to_drm(adev), "kv_populate_uvd_table failed\n");
12881288
return ret;
12891289
}
12901290
ret = kv_populate_vce_table(adev);
12911291
if (ret) {
1292-
DRM_ERROR("kv_populate_vce_table failed\n");
1292+
drm_err(adev_to_drm(adev), "kv_populate_vce_table failed\n");
12931293
return ret;
12941294
}
12951295
ret = kv_populate_samu_table(adev);
12961296
if (ret) {
1297-
DRM_ERROR("kv_populate_samu_table failed\n");
1297+
drm_err(adev_to_drm(adev), "kv_populate_samu_table failed\n");
12981298
return ret;
12991299
}
13001300
ret = kv_populate_acp_table(adev);
13011301
if (ret) {
1302-
DRM_ERROR("kv_populate_acp_table failed\n");
1302+
drm_err(adev_to_drm(adev), "kv_populate_acp_table failed\n");
13031303
return ret;
13041304
}
13051305
kv_program_vc(adev);
@@ -1310,55 +1310,55 @@ static int kv_dpm_enable(struct amdgpu_device *adev)
13101310
if (pi->enable_auto_thermal_throttling) {
13111311
ret = kv_enable_auto_thermal_throttling(adev);
13121312
if (ret) {
1313-
DRM_ERROR("kv_enable_auto_thermal_throttling failed\n");
1313+
drm_err(adev_to_drm(adev), "kv_enable_auto_thermal_throttling failed\n");
13141314
return ret;
13151315
}
13161316
}
13171317
ret = kv_enable_dpm_voltage_scaling(adev);
13181318
if (ret) {
1319-
DRM_ERROR("kv_enable_dpm_voltage_scaling failed\n");
1319+
drm_err(adev_to_drm(adev), "kv_enable_dpm_voltage_scaling failed\n");
13201320
return ret;
13211321
}
13221322
ret = kv_set_dpm_interval(adev);
13231323
if (ret) {
1324-
DRM_ERROR("kv_set_dpm_interval failed\n");
1324+
drm_err(adev_to_drm(adev), "kv_set_dpm_interval failed\n");
13251325
return ret;
13261326
}
13271327
ret = kv_set_dpm_boot_state(adev);
13281328
if (ret) {
1329-
DRM_ERROR("kv_set_dpm_boot_state failed\n");
1329+
drm_err(adev_to_drm(adev), "kv_set_dpm_boot_state failed\n");
13301330
return ret;
13311331
}
13321332
ret = kv_enable_ulv(adev, true);
13331333
if (ret) {
1334-
DRM_ERROR("kv_enable_ulv failed\n");
1334+
drm_err(adev_to_drm(adev), "kv_enable_ulv failed\n");
13351335
return ret;
13361336
}
13371337
kv_start_dpm(adev);
13381338
ret = kv_enable_didt(adev, true);
13391339
if (ret) {
1340-
DRM_ERROR("kv_enable_didt failed\n");
1340+
drm_err(adev_to_drm(adev), "kv_enable_didt failed\n");
13411341
return ret;
13421342
}
13431343
ret = kv_enable_smc_cac(adev, true);
13441344
if (ret) {
1345-
DRM_ERROR("kv_enable_smc_cac failed\n");
1345+
drm_err(adev_to_drm(adev), "kv_enable_smc_cac failed\n");
13461346
return ret;
13471347
}
13481348

13491349
kv_reset_acp_boot_level(adev);
13501350

13511351
ret = amdgpu_kv_smc_bapm_enable(adev, false);
13521352
if (ret) {
1353-
DRM_ERROR("amdgpu_kv_smc_bapm_enable failed\n");
1353+
drm_err(adev_to_drm(adev), "amdgpu_kv_smc_bapm_enable failed\n");
13541354
return ret;
13551355
}
13561356

13571357
if (adev->irq.installed &&
13581358
kv_is_internal_thermal_sensor(adev->pm.int_thermal_type)) {
13591359
ret = kv_set_thermal_temperature_range(adev, KV_TEMP_RANGE_MIN, KV_TEMP_RANGE_MAX);
13601360
if (ret) {
1361-
DRM_ERROR("kv_set_thermal_temperature_range failed\n");
1361+
drm_err(adev_to_drm(adev), "kv_set_thermal_temperature_range failed\n");
13621362
return ret;
13631363
}
13641364
amdgpu_irq_get(adev, &adev->pm.dpm.thermal.irq,
@@ -1382,7 +1382,7 @@ static void kv_dpm_disable(struct amdgpu_device *adev)
13821382

13831383
err = amdgpu_kv_smc_bapm_enable(adev, false);
13841384
if (err)
1385-
DRM_ERROR("amdgpu_kv_smc_bapm_enable failed\n");
1385+
drm_err(adev_to_drm(adev), "amdgpu_kv_smc_bapm_enable failed\n");
13861386

13871387
if (adev->asic_type == CHIP_MULLINS)
13881388
kv_enable_nb_dpm(adev, false);
@@ -1920,7 +1920,7 @@ static int kv_dpm_set_power_state(void *handle)
19201920
if (pi->bapm_enable) {
19211921
ret = amdgpu_kv_smc_bapm_enable(adev, adev->pm.ac_power);
19221922
if (ret) {
1923-
DRM_ERROR("amdgpu_kv_smc_bapm_enable failed\n");
1923+
drm_err(adev_to_drm(adev), "amdgpu_kv_smc_bapm_enable failed\n");
19241924
return ret;
19251925
}
19261926
}
@@ -1931,7 +1931,7 @@ static int kv_dpm_set_power_state(void *handle)
19311931
kv_update_dfs_bypass_settings(adev, new_ps);
19321932
ret = kv_calculate_ds_divider(adev);
19331933
if (ret) {
1934-
DRM_ERROR("kv_calculate_ds_divider failed\n");
1934+
drm_err(adev_to_drm(adev), "kv_calculate_ds_divider failed\n");
19351935
return ret;
19361936
}
19371937
kv_calculate_nbps_level_settings(adev);
@@ -1947,7 +1947,7 @@ static int kv_dpm_set_power_state(void *handle)
19471947

19481948
ret = kv_update_vce_dpm(adev, new_ps, old_ps);
19491949
if (ret) {
1950-
DRM_ERROR("kv_update_vce_dpm failed\n");
1950+
drm_err(adev_to_drm(adev), "kv_update_vce_dpm failed\n");
19511951
return ret;
19521952
}
19531953
kv_update_sclk_t(adev);
@@ -1960,7 +1960,7 @@ static int kv_dpm_set_power_state(void *handle)
19601960
kv_update_dfs_bypass_settings(adev, new_ps);
19611961
ret = kv_calculate_ds_divider(adev);
19621962
if (ret) {
1963-
DRM_ERROR("kv_calculate_ds_divider failed\n");
1963+
drm_err(adev_to_drm(adev), "kv_calculate_ds_divider failed\n");
19641964
return ret;
19651965
}
19661966
kv_calculate_nbps_level_settings(adev);
@@ -1972,7 +1972,7 @@ static int kv_dpm_set_power_state(void *handle)
19721972
kv_set_enabled_levels(adev);
19731973
ret = kv_update_vce_dpm(adev, new_ps, old_ps);
19741974
if (ret) {
1975-
DRM_ERROR("kv_update_vce_dpm failed\n");
1975+
drm_err(adev_to_drm(adev), "kv_update_vce_dpm failed\n");
19761976
return ret;
19771977
}
19781978
kv_update_acp_boot_level(adev);
@@ -2521,7 +2521,7 @@ static int kv_set_thermal_temperature_range(struct amdgpu_device *adev,
25212521
if (high_temp > max_temp)
25222522
high_temp = max_temp;
25232523
if (high_temp < low_temp) {
2524-
DRM_ERROR("invalid thermal range: %d - %d\n", low_temp, high_temp);
2524+
drm_err(adev_to_drm(adev), "invalid thermal range: %d - %d\n", low_temp, high_temp);
25252525
return -EINVAL;
25262526
}
25272527

@@ -2563,7 +2563,7 @@ static int kv_parse_sys_info_table(struct amdgpu_device *adev)
25632563
data_offset);
25642564

25652565
if (crev != 8) {
2566-
DRM_ERROR("Unsupported IGP table: %d %d\n", frev, crev);
2566+
drm_err(adev_to_drm(adev), "Unsupported IGP table: %d %d\n", frev, crev);
25672567
return -EINVAL;
25682568
}
25692569
pi->sys_info.bootup_sclk = le32_to_cpu(igp_info->info_8.ulBootUpEngineClock);
@@ -2579,7 +2579,7 @@ static int kv_parse_sys_info_table(struct amdgpu_device *adev)
25792579
else
25802580
pi->sys_info.htc_hyst_lmt = igp_info->info_8.ucHtcHystLmt;
25812581
if (pi->sys_info.htc_tmp_lmt <= pi->sys_info.htc_hyst_lmt) {
2582-
DRM_ERROR("The htcTmpLmt should be larger than htcHystLmt.\n");
2582+
drm_err(adev_to_drm(adev), "The htcTmpLmt should be larger than htcHystLmt.\n");
25832583
}
25842584

25852585
if (le32_to_cpu(igp_info->info_8.ulSystemConfig) & (1 << 3))
@@ -3015,13 +3015,13 @@ static int kv_dpm_sw_init(struct amdgpu_ip_block *ip_block)
30153015
adev->pm.dpm.current_ps = adev->pm.dpm.requested_ps = adev->pm.dpm.boot_ps;
30163016
if (amdgpu_dpm == 1)
30173017
amdgpu_pm_print_power_states(adev);
3018-
DRM_INFO("amdgpu: dpm initialized\n");
3018+
drm_info(adev_to_drm(adev), "dpm initialized\n");
30193019

30203020
return 0;
30213021

30223022
dpm_failed:
30233023
kv_dpm_fini(adev);
3024-
DRM_ERROR("amdgpu: dpm initialization failed\n");
3024+
drm_err(adev_to_drm(adev), "dpm initialization failed: %d\n", ret);
30253025
return ret;
30263026
}
30273027

0 commit comments

Comments
 (0)