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>

diff --git a/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c b/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c
index 5d0b18062b8c1801649e342697cd06a65f2b2416..307ebf7e32267b79dadf3d59d4a5568ad290fad0 100644 (file)
--- a/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c
+++ b/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c
@@ -1242,7 +1242,7 @@ static void kv_dpm_enable_bapm(void *handle, bool enable)
        if (pi->bapm_enable) {
                ret = amdgpu_kv_smc_bapm_enable(adev, enable);
                if (ret)
-                       DRM_ERROR("amdgpu_kv_smc_bapm_enable failed\n");
+                       drm_err(adev_to_drm(adev), "amdgpu_kv_smc_bapm_enable failed\n");
        }
 }
 
@@ -1266,40 +1266,40 @@ static int kv_dpm_enable(struct amdgpu_device *adev)
 
        ret = kv_process_firmware_header(adev);
        if (ret) {
-               DRM_ERROR("kv_process_firmware_header failed\n");
+               drm_err(adev_to_drm(adev), "kv_process_firmware_header failed\n");
                return ret;
        }
        kv_init_fps_limits(adev);
        kv_init_graphics_levels(adev);
        ret = kv_program_bootup_state(adev);
        if (ret) {
-               DRM_ERROR("kv_program_bootup_state failed\n");
+               drm_err(adev_to_drm(adev), "kv_program_bootup_state failed\n");
                return ret;
        }
        kv_calculate_dfs_bypass_settings(adev);
        ret = kv_upload_dpm_settings(adev);
        if (ret) {
-               DRM_ERROR("kv_upload_dpm_settings failed\n");
+               drm_err(adev_to_drm(adev), "kv_upload_dpm_settings failed\n");
                return ret;
        }
        ret = kv_populate_uvd_table(adev);
        if (ret) {
-               DRM_ERROR("kv_populate_uvd_table failed\n");
+               drm_err(adev_to_drm(adev), "kv_populate_uvd_table failed\n");
                return ret;
        }
        ret = kv_populate_vce_table(adev);
        if (ret) {
-               DRM_ERROR("kv_populate_vce_table failed\n");
+               drm_err(adev_to_drm(adev), "kv_populate_vce_table failed\n");
                return ret;
        }
        ret = kv_populate_samu_table(adev);
        if (ret) {
-               DRM_ERROR("kv_populate_samu_table failed\n");
+               drm_err(adev_to_drm(adev), "kv_populate_samu_table failed\n");
                return ret;
        }
        ret = kv_populate_acp_table(adev);
        if (ret) {
-               DRM_ERROR("kv_populate_acp_table failed\n");
+               drm_err(adev_to_drm(adev), "kv_populate_acp_table failed\n");
                return ret;
        }
        kv_program_vc(adev);
@@ -1310,39 +1310,39 @@ static int kv_dpm_enable(struct amdgpu_device *adev)
        if (pi->enable_auto_thermal_throttling) {
                ret = kv_enable_auto_thermal_throttling(adev);
                if (ret) {
-                       DRM_ERROR("kv_enable_auto_thermal_throttling failed\n");
+                       drm_err(adev_to_drm(adev), "kv_enable_auto_thermal_throttling failed\n");
                        return ret;
                }
        }
        ret = kv_enable_dpm_voltage_scaling(adev);
        if (ret) {
-               DRM_ERROR("kv_enable_dpm_voltage_scaling failed\n");
+               drm_err(adev_to_drm(adev), "kv_enable_dpm_voltage_scaling failed\n");
                return ret;
        }
        ret = kv_set_dpm_interval(adev);
        if (ret) {
-               DRM_ERROR("kv_set_dpm_interval failed\n");
+               drm_err(adev_to_drm(adev), "kv_set_dpm_interval failed\n");
                return ret;
        }
        ret = kv_set_dpm_boot_state(adev);
        if (ret) {
-               DRM_ERROR("kv_set_dpm_boot_state failed\n");
+               drm_err(adev_to_drm(adev), "kv_set_dpm_boot_state failed\n");
                return ret;
        }
        ret = kv_enable_ulv(adev, true);
        if (ret) {
-               DRM_ERROR("kv_enable_ulv failed\n");
+               drm_err(adev_to_drm(adev), "kv_enable_ulv failed\n");
                return ret;
        }
        kv_start_dpm(adev);
        ret = kv_enable_didt(adev, true);
        if (ret) {
-               DRM_ERROR("kv_enable_didt failed\n");
+               drm_err(adev_to_drm(adev), "kv_enable_didt failed\n");
                return ret;
        }
        ret = kv_enable_smc_cac(adev, true);
        if (ret) {
-               DRM_ERROR("kv_enable_smc_cac failed\n");
+               drm_err(adev_to_drm(adev), "kv_enable_smc_cac failed\n");
                return ret;
        }
 
@@ -1350,7 +1350,7 @@ static int kv_dpm_enable(struct amdgpu_device *adev)
 
        ret = amdgpu_kv_smc_bapm_enable(adev, false);
        if (ret) {
-               DRM_ERROR("amdgpu_kv_smc_bapm_enable failed\n");
+               drm_err(adev_to_drm(adev), "amdgpu_kv_smc_bapm_enable failed\n");
                return ret;
        }
 
@@ -1358,7 +1358,7 @@ static int kv_dpm_enable(struct amdgpu_device *adev)
            kv_is_internal_thermal_sensor(adev->pm.int_thermal_type)) {
                ret = kv_set_thermal_temperature_range(adev, KV_TEMP_RANGE_MIN, KV_TEMP_RANGE_MAX);
                if (ret) {
-                       DRM_ERROR("kv_set_thermal_temperature_range failed\n");
+                       drm_err(adev_to_drm(adev), "kv_set_thermal_temperature_range failed\n");
                        return ret;
                }
                amdgpu_irq_get(adev, &adev->pm.dpm.thermal.irq,
@@ -1382,7 +1382,7 @@ static void kv_dpm_disable(struct amdgpu_device *adev)
 
        err = amdgpu_kv_smc_bapm_enable(adev, false);
        if (err)
-               DRM_ERROR("amdgpu_kv_smc_bapm_enable failed\n");
+               drm_err(adev_to_drm(adev), "amdgpu_kv_smc_bapm_enable failed\n");
 
        if (adev->asic_type == CHIP_MULLINS)
                kv_enable_nb_dpm(adev, false);
@@ -1920,7 +1920,7 @@ static int kv_dpm_set_power_state(void *handle)
        if (pi->bapm_enable) {
                ret = amdgpu_kv_smc_bapm_enable(adev, adev->pm.ac_power);
                if (ret) {
-                       DRM_ERROR("amdgpu_kv_smc_bapm_enable failed\n");
+                       drm_err(adev_to_drm(adev), "amdgpu_kv_smc_bapm_enable failed\n");
                        return ret;
                }
        }
@@ -1931,7 +1931,7 @@ static int kv_dpm_set_power_state(void *handle)
                        kv_update_dfs_bypass_settings(adev, new_ps);
                        ret = kv_calculate_ds_divider(adev);
                        if (ret) {
-                               DRM_ERROR("kv_calculate_ds_divider failed\n");
+                               drm_err(adev_to_drm(adev), "kv_calculate_ds_divider failed\n");
                                return ret;
                        }
                        kv_calculate_nbps_level_settings(adev);
@@ -1947,7 +1947,7 @@ static int kv_dpm_set_power_state(void *handle)
 
                        ret = kv_update_vce_dpm(adev, new_ps, old_ps);
                        if (ret) {
-                               DRM_ERROR("kv_update_vce_dpm failed\n");
+                               drm_err(adev_to_drm(adev), "kv_update_vce_dpm failed\n");
                                return ret;
                        }
                        kv_update_sclk_t(adev);
@@ -1960,7 +1960,7 @@ static int kv_dpm_set_power_state(void *handle)
                        kv_update_dfs_bypass_settings(adev, new_ps);
                        ret = kv_calculate_ds_divider(adev);
                        if (ret) {
-                               DRM_ERROR("kv_calculate_ds_divider failed\n");
+                               drm_err(adev_to_drm(adev), "kv_calculate_ds_divider failed\n");
                                return ret;
                        }
                        kv_calculate_nbps_level_settings(adev);
@@ -1972,7 +1972,7 @@ static int kv_dpm_set_power_state(void *handle)
                        kv_set_enabled_levels(adev);
                        ret = kv_update_vce_dpm(adev, new_ps, old_ps);
                        if (ret) {
-                               DRM_ERROR("kv_update_vce_dpm failed\n");
+                               drm_err(adev_to_drm(adev), "kv_update_vce_dpm failed\n");
                                return ret;
                        }
                        kv_update_acp_boot_level(adev);
@@ -2521,7 +2521,7 @@ static int kv_set_thermal_temperature_range(struct amdgpu_device *adev,
        if (high_temp > max_temp)
                high_temp = max_temp;
        if (high_temp < low_temp) {
-               DRM_ERROR("invalid thermal range: %d - %d\n", low_temp, high_temp);
+               drm_err(adev_to_drm(adev), "invalid thermal range: %d - %d\n", low_temp, high_temp);
                return -EINVAL;
        }
 
@@ -2563,7 +2563,7 @@ static int kv_parse_sys_info_table(struct amdgpu_device *adev)
                                              data_offset);
 
                if (crev != 8) {
-                       DRM_ERROR("Unsupported IGP table: %d %d\n", frev, crev);
+                       drm_err(adev_to_drm(adev), "Unsupported IGP table: %d %d\n", frev, crev);
                        return -EINVAL;
                }
                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)
                else
                        pi->sys_info.htc_hyst_lmt = igp_info->info_8.ucHtcHystLmt;
                if (pi->sys_info.htc_tmp_lmt <= pi->sys_info.htc_hyst_lmt) {
-                       DRM_ERROR("The htcTmpLmt should be larger than htcHystLmt.\n");
+                       drm_err(adev_to_drm(adev), "The htcTmpLmt should be larger than htcHystLmt.\n");
                }
 
                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)
        adev->pm.dpm.current_ps = adev->pm.dpm.requested_ps = adev->pm.dpm.boot_ps;
        if (amdgpu_dpm == 1)
                amdgpu_pm_print_power_states(adev);
-       DRM_INFO("amdgpu: dpm initialized\n");
+       drm_info(adev_to_drm(adev), "dpm initialized\n");
 
        return 0;
 
 dpm_failed:
        kv_dpm_fini(adev);
-       DRM_ERROR("amdgpu: dpm initialization failed\n");
+       drm_err(adev_to_drm(adev), "dpm initialization failed: %d\n", ret);
        return ret;
 }