drm/amd/powerplay: refine pr_* prints for powerplay
Subsystems (2)
v2 cover drm/amd/powerplay: refine pr_* prints for powerplay
From: Huang Rui <[email protected]>
Hi all,
Merry Christmas! No one generate patches at this time except us :-).
The following patch set doesn't have any function change, just refine prints of powerplay. Powerplay will used pr_* instead of raw printk, and we can dynamic change the debug level with it.
The prefix is like below:
[ xxx.xxxxxx] amdgpu: [powerplay] ...
Best Wishes,
Rui
Huang Rui (6):
drm/amd/powerplay: add prefix for all powerplay pr_* prints drm/amd/powerplay: reshuffle headers to make pr_fmt macro before
<linux/xxx.h>
drm/amd/powerplay: refine print message for amd_powerplay drm/amd/powerplay: update all printk to pr_* on eventmgr drm/amd/powerplay: update all printk to pr_* on hwmgr drm/amd/powerplay: update all printk to pr_* on smumgr
drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 50 +++++++++++----------- drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 29 ++++++------- .../gpu/drm/amd/powerplay/hwmgr/functiontables.c | 14 +++--- .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 11 ++--- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 8 ++-- .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 6 +-- .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 28 ++++++------ .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 4 +- drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 10 ++++- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 28 ++++++------ drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 6 +-- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 10 ++--- drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 10 ++--- .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 4 +- .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 6 +-- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 10 ++--- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 14 +++--- drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 16 +++---- .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 4 +- 22 files changed, 140 insertions(+), 134 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1482738991-25373-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org
PATCH v2 1/6 drm/amd/powerplay: add prefix for all powerplay pr_* prints
Powerplay will use them instead of raw printk, and we can dynamic change the debug level with it.
The prefix is like below:
[ xxx.xxxxxx] amdgpu: [powerplay] ...
--- drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/inc/pp_debug.h +8 -2
@@ -24,6 +24,12 @@#ifndef PP_DEBUG_H #define PP_DEBUG_H +#ifdef pr_fmt +#undef pr_fmt +#endif + +#define pr_fmt (fmt) "amdgpu: [powerplay] " fmt +#include <linux/types.h> #include <linux/kernel.h> #include <linux/slab.h>
@@ -31,7 +37,7 @@#define PP_ASSERT_WITH_CODE (cond, msg, code) \ do { \ if (!(cond)) { \ - printk("%s\n", msg); \ + pr_warning("%s\n", msg); \ code; \ } \ } while (0)
@@ -39,7 +45,7 @@#define PP_DBG_LOG (fmt, ...) \ do { \ - if(0)printk(KERN_INFO "[ pp_dbg ] " fmt, ##__VA_ARGS__); \ + pr_debug(fmt, ##__VA_ARGS__); \ } while (0)
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 2/6 drm/amd/powerplay: reshuffle headers to make pr_fmt macro before <linux/xxx.h>
In reply to a message not in the archiveThis patch reshuffles headers to define pr_fmt before <linux/xxx.h>. It can avoid pr_fmt redefine warnning from linux/xxx.h like below:
CC [M] /home/ray/gpu/BUILD/x86_64/linux/drivers/gpu/drm/amd/amdgpu//../powerplay/amd_powerplay.o /home/ray/gpu/BUILD/x86_64/linux/drivers/gpu/drm/amd/amdgpu//../powerplay/amd_powerplay.c:24:0: warning: "pr_fmt" redefined
#define pr_fmt(fmt) "[powerplay] " fmt
^
In file included from include/linux/kernel.h:13:0,
from include/linux/list.h:8,
from include/linux/agp_backend.h:33,
--- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 3 +-- drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 3 ++- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +1 -1
@@ -20,6 +20,7 @@* OTHER DEALINGS IN THE SOFTWARE. * */ +#include "pp_debug.h" #include <linux/types.h> #include <linux/kernel.h> #include <linux/gfp.h>
@@ -29,7 +30,6 @@#include "pp_instance.h" #include "power_state.h" #include "eventmanager.h" -#include "pp_debug.h" #define PP_CHECK (handle) \
drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +1 -2
@@ -20,13 +20,13 @@* OTHER DEALINGS IN THE SOFTWARE. * */ +#include "pp_debug.h" #include <linux/types.h> #include <linux/kernel.h> #include <linux/slab.h> #include "atom-types.h" #include "atombios.h" #include "processpptables.h" -#include "pp_debug.h" #include "cgs_common.h" #include "smu/smu_8_0_d.h" #include "smu8_fusion.h"
@@ -38,7 +38,6 @@#include "cz_hwmgr.h" #include "power_state.h" #include "cz_clockpowergating.h" -#include "pp_debug.h" #define ixSMUSVI_NB_CURRENTVID 0xD8230044#define CURRENT_NB_VID_MASK 0xff000000
drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c +1 -1
@@ -20,11 +20,11 @@* OTHER DEALINGS IN THE SOFTWARE. * */ +#include "pp_debug.h" #include <linux/errno.h> #include "hwmgr.h" #include "hardwaremanager.h" #include "power_state.h" -#include "pp_debug.h" #define PHM_FUNC_CHECK (hw) \ do { \
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +2 -1
@@ -20,6 +20,8 @@* OTHER DEALINGS IN THE SOFTWARE. * */ + +#include "pp_debug.h" #include "linux/delay.h" #include <linux/types.h> #include <linux/kernel.h>
@@ -29,7 +31,6 @@#include "power_state.h" #include "hwmgr.h" #include "pppcielanes.h" -#include "pp_debug.h" #include "ppatomctrl.h" #include "ppsmc.h" #include "pp_acpi.h"
drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c +1 -1
@@ -20,6 +20,7 @@* OTHER DEALINGS IN THE SOFTWARE. * */ +#include "pp_debug.h" #include <linux/module.h> #include <linux/slab.h> #include <linux/fb.h>
@@ -27,7 +28,6 @@#include "ppatomctrl.h" #include "atombios.h" #include "cgs_common.h" -#include "pp_debug.h" #include "ppevvmath.h" #define MEM_ID_MASK 0xff000000
drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c +1 -1
@@ -20,6 +20,7 @@* OTHER DEALINGS IN THE SOFTWARE. * */ +#include "pp_debug.h" #include <linux/module.h> #include <linux/slab.h> #include <linux/fb.h>
@@ -27,7 +28,6 @@#include "process_pptables_v1_0.h" #include "ppatomctrl.h" #include "atombios.h" -#include "pp_debug.h" #include "hwmgr.h" #include "cgs_common.h" #include "pptable_v1_0.h"
drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c +1 -1
@@ -20,6 +20,7 @@* OTHER DEALINGS IN THE SOFTWARE. * */ +#include "pp_debug.h" #include <linux/types.h> #include <linux/kernel.h> #include <linux/slab.h>
@@ -27,7 +28,6 @@#include "processpptables.h" #include <atom-types.h> #include <atombios.h> -#include "pp_debug.h" #include "pptable.h" #include "power_state.h" #include "hwmgr.h"
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1 -1
@@ -20,13 +20,13 @@* OTHER DEALINGS IN THE SOFTWARE. * */ +#include "pp_debug.h" #include <linux/module.h> #include <linux/slab.h> #include <linux/fb.h> #include <asm/div64.h> #include "linux/delay.h" #include "pp_acpi.h" -#include "pp_debug.h" #include "ppatomctrl.h" #include "atombios.h" #include "pptable_v1_0.h"
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c +1 -1
@@ -20,11 +20,11 @@* OTHER DEALINGS IN THE SOFTWARE. * */ +#include "pp_debug.h" #include "hwmgr.h" #include "smumgr.h" #include "smu7_hwmgr.h" #include "smu7_powertune.h" -#include "pp_debug.h" #include "smu7_common.h" #define VOLTAGE_SCALE 4
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c +1 -1
@@ -21,13 +21,13 @@* */ +#include "pp_debug.h" #include "fiji_smc.h" #include "smu7_dyn_defaults.h" #include "smu7_hwmgr.h" #include "hardwaremanager.h" #include "ppatomctrl.h" -#include "pp_debug.h" #include "cgs_common.h" #include "atombios.h" #include "fiji_smumgr.h"
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +1 -1
@@ -21,6 +21,7 @@* */ +#include "pp_debug.h" #include "smumgr.h" #include "smu73.h" #include "smu_ucode_xfer_vi.h"
@@ -36,7 +37,6 @@#include "gca/gfx_8_0_d.h" #include "bif/bif_5_0_d.h" #include "bif/bif_5_0_sh_mask.h" -#include "pp_debug.h" #include "fiji_pwrvirus.h" #include "fiji_smc.h"
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c +1 -1
@@ -21,13 +21,13 @@* */ +#include "pp_debug.h" #include "iceland_smc.h" #include "smu7_dyn_defaults.h" #include "smu7_hwmgr.h" #include "hardwaremanager.h" #include "ppatomctrl.h" -#include "pp_debug.h" #include "cgs_common.h" #include "atombios.h" #include "pppcielanes.h"
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c +1 -1
@@ -22,6 +22,7 @@* Author: Huang Rui <[email protected]> * */ +#include "pp_debug.h" #include <linux/types.h> #include <linux/kernel.h> #include <linux/slab.h>
@@ -29,7 +30,6 @@#include "smumgr.h" #include "iceland_smumgr.h" -#include "pp_debug.h" #include "smu_ucode_xfer_vi.h" #include "ppsmc.h" #include "smu/smu_7_1_1_d.h"
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c +1 -1
@@ -21,13 +21,13 @@* */ +#include "pp_debug.h" #include "polaris10_smc.h" #include "smu7_dyn_defaults.h" #include "smu7_hwmgr.h" #include "hardwaremanager.h" #include "ppatomctrl.h" -#include "pp_debug.h" #include "cgs_common.h" #include "atombios.h" #include "polaris10_smumgr.h"
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +1 -1
@@ -21,6 +21,7 @@* */ +#include "pp_debug.h" #include "smumgr.h" #include "smu74.h" #include "smu_ucode_xfer_vi.h"
@@ -36,7 +37,6 @@#include "bif/bif_5_0_sh_mask.h" #include "polaris10_pwrvirus.h" #include "ppatomctrl.h" -#include "pp_debug.h" #include "cgs_common.h" #include "polaris10_smc.h" #include "smu7_ppsmc.h"
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +1 -1
@@ -22,12 +22,12 @@*/ +#include "pp_debug.h" #include "smumgr.h" #include "smu_ucode_xfer_vi.h" #include "smu/smu_7_1_3_d.h" #include "smu/smu_7_1_3_sh_mask.h" #include "ppatomctrl.h" -#include "pp_debug.h" #include "cgs_common.h" #include "smu7_ppsmc.h" #include "smu7_smumgr.h"
drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c +1 -1
@@ -21,13 +21,13 @@* */ +#include "pp_debug.h" #include "tonga_smc.h" #include "smu7_dyn_defaults.h" #include "smu7_hwmgr.h" #include "hardwaremanager.h" #include "ppatomctrl.h" -#include "pp_debug.h" #include "cgs_common.h" #include "atombios.h" #include "tonga_smumgr.h"
drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c +1 -1
@@ -20,6 +20,7 @@* OTHER DEALINGS IN THE SOFTWARE. * */ +#include "pp_debug.h" #include <linux/types.h> #include <linux/kernel.h> #include <linux/slab.h>
@@ -27,7 +28,6 @@#include "smumgr.h" #include "tonga_smumgr.h" -#include "pp_debug.h" #include "smu_ucode_xfer_vi.h" #include "tonga_ppsmc.h" #include "smu/smu_7_1_2_d.h"
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 3/6 drm/amd/powerplay: refine print message for amd_powerplay
In reply to a message not in the archive--- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 48 +++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-)
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +24 -24
@@ -82,7 +82,7 @@ static int pp_sw_init(void *handle) goto err2; } -pr_info ("amdgpu: powerplay initialized\n" ); +pr_info ("initialized.\n" );return 0 ; err2:
@@ -92,7 +92,7 @@ err1:if (hwmgr->pptable_func->pptable_fini) hwmgr->pptable_func->pptable_fini (hwmgr); err: -pr_err ("amdgpu: powerplay initialization failed\n" ); +pr_err ("initialization failed\n" );return ret; }
@@ -144,13 +144,13 @@ static int pp_hw_init(void *handle) ret = smumgr->smumgr_funcs->smu_init (smumgr);if (ret) { -printk (KERN_ERR "[ powerplay ] smc initialization failed\n" ); +pr_err ("smc initialization failed\n" );return ret; } ret = smumgr->smumgr_funcs->start_smu (smumgr);if (ret) { -printk (KERN_ERR "[ powerplay ] smc start failed\n" ); +pr_err ("smc start failed\n" ); smumgr->smumgr_funcs->smu_fini (smumgr);return ret; }
@@ -219,7 +219,7 @@ int amd_set_clockgating_by_smu(void *handle, uint32_t msg_id)PP_CHECK_HW (hwmgr);if (hwmgr->hwmgr_func->update_clock_gatings ==NULL ) { -printk (KERN_INFO "%s was not implemented.\n" , __func__); +pr_info ("%s was not implemented.\n" , __func__);return 0 ; }
@@ -239,7 +239,7 @@ static int pp_set_powergating_state(void *handle,PP_CHECK_HW (hwmgr);if (hwmgr->hwmgr_func->enable_per_cu_power_gating ==NULL ) { -printk (KERN_INFO "%s was not implemented.\n" , __func__); +pr_info ("%s was not implemented.\n" , __func__);return 0 ; }
@@ -285,7 +285,7 @@ static int pp_resume(void *handle) ret = smumgr->smumgr_funcs->start_smu (smumgr);if (ret) { -printk (KERN_ERR "[ powerplay ] smc start failed\n" ); +pr_err ("smc start failed\n" ); smumgr->smumgr_funcs->smu_fini (smumgr);return ret; }
@@ -340,7 +340,7 @@ static int pp_dpm_force_performance_level(void *handle,PP_CHECK_HW (hwmgr);if (hwmgr->hwmgr_func->force_dpm_level ==NULL ) { -printk (KERN_INFO "%s was not implemented.\n" , __func__); +pr_info ("%s was not implemented.\n" , __func__);return 0 ; }
@@ -376,7 +376,7 @@ static int pp_dpm_get_sclk(void *handle, bool low)PP_CHECK_HW (hwmgr);if (hwmgr->hwmgr_func->get_sclk ==NULL ) { -printk (KERN_INFO "%s was not implemented.\n" , __func__); +pr_info ("%s was not implemented.\n" , __func__);return 0 ; }
@@ -395,7 +395,7 @@ static int pp_dpm_get_mclk(void *handle, bool low)PP_CHECK_HW (hwmgr);if (hwmgr->hwmgr_func->get_mclk ==NULL ) { -printk (KERN_INFO "%s was not implemented.\n" , __func__); +pr_info ("%s was not implemented.\n" , __func__);return 0 ; }
@@ -414,7 +414,7 @@ static int pp_dpm_powergate_vce(void *handle, bool gate)PP_CHECK_HW (hwmgr);if (hwmgr->hwmgr_func->powergate_vce ==NULL ) { -printk (KERN_INFO "%s was not implemented.\n" , __func__); +pr_info ("%s was not implemented.\n" , __func__);return 0 ; }
@@ -433,7 +433,7 @@ static int pp_dpm_powergate_uvd(void *handle, bool gate)PP_CHECK_HW (hwmgr);if (hwmgr->hwmgr_func->powergate_uvd ==NULL ) { -printk (KERN_INFO "%s was not implemented.\n" , __func__); +pr_info ("%s was not implemented.\n" , __func__);return 0 ; }
@@ -539,7 +539,7 @@ static int pp_dpm_set_fan_control_mode(void *handle, uint32_t mode)PP_CHECK_HW (hwmgr);if (hwmgr->hwmgr_func->set_fan_control_mode ==NULL ) { -printk (KERN_INFO "%s was not implemented.\n" , __func__); +pr_info ("%s was not implemented.\n" , __func__);return 0 ; }
@@ -558,7 +558,7 @@ static int pp_dpm_get_fan_control_mode(void *handle)PP_CHECK_HW (hwmgr);if (hwmgr->hwmgr_func->get_fan_control_mode ==NULL ) { -printk (KERN_INFO "%s was not implemented.\n" , __func__); +pr_info ("%s was not implemented.\n" , __func__);return 0 ; }
@@ -577,7 +577,7 @@ static int pp_dpm_set_fan_speed_percent(void *handle, uint32_t percent)PP_CHECK_HW (hwmgr);if (hwmgr->hwmgr_func->set_fan_speed_percent ==NULL ) { -printk (KERN_INFO "%s was not implemented.\n" , __func__); +pr_info ("%s was not implemented.\n" , __func__);return 0 ; }
@@ -596,7 +596,7 @@ static int pp_dpm_get_fan_speed_percent(void *handle, uint32_t *speed)PP_CHECK_HW (hwmgr);if (hwmgr->hwmgr_func->get_fan_speed_percent ==NULL ) { -printk (KERN_INFO "%s was not implemented.\n" , __func__); +pr_info ("%s was not implemented.\n" , __func__);return 0 ; }
@@ -632,7 +632,7 @@ static int pp_dpm_get_temperature(void *handle)PP_CHECK_HW (hwmgr);if (hwmgr->hwmgr_func->get_temperature ==NULL ) { -printk (KERN_INFO "%s was not implemented.\n" , __func__); +pr_info ("%s was not implemented.\n" , __func__);return 0 ; }
@@ -738,7 +738,7 @@ static int pp_dpm_force_clock_level(void *handle,PP_CHECK_HW (hwmgr);if (hwmgr->hwmgr_func->force_clock_level ==NULL ) { -printk (KERN_INFO "%s was not implemented.\n" , __func__); +pr_info ("%s was not implemented.\n" , __func__);return 0 ; }
@@ -758,7 +758,7 @@ static int pp_dpm_print_clock_levels(void *handle,PP_CHECK_HW (hwmgr);if (hwmgr->hwmgr_func->print_clock_levels ==NULL ) { -printk (KERN_INFO "%s was not implemented.\n" , __func__); +pr_info ("%s was not implemented.\n" , __func__);return 0 ; }return hwmgr->hwmgr_func->print_clock_levels (hwmgr, type, buf);
@@ -776,7 +776,7 @@ static int pp_dpm_get_sclk_od(void *handle)PP_CHECK_HW (hwmgr);if (hwmgr->hwmgr_func->get_sclk_od ==NULL ) { -printk (KERN_INFO "%s was not implemented.\n" , __func__); +pr_info ("%s was not implemented.\n" , __func__);return 0 ; }
@@ -795,7 +795,7 @@ static int pp_dpm_set_sclk_od(void *handle, uint32_t value)PP_CHECK_HW (hwmgr);if (hwmgr->hwmgr_func->set_sclk_od ==NULL ) { -printk (KERN_INFO "%s was not implemented.\n" , __func__); +pr_info ("%s was not implemented.\n" , __func__);return 0 ; }
@@ -814,7 +814,7 @@ static int pp_dpm_get_mclk_od(void *handle)PP_CHECK_HW (hwmgr);if (hwmgr->hwmgr_func->get_mclk_od ==NULL ) { -printk (KERN_INFO "%s was not implemented.\n" , __func__); +pr_info ("%s was not implemented.\n" , __func__);return 0 ; }
@@ -833,7 +833,7 @@ static int pp_dpm_set_mclk_od(void *handle, uint32_t value)PP_CHECK_HW (hwmgr);if (hwmgr->hwmgr_func->set_mclk_od ==NULL ) { -printk (KERN_INFO "%s was not implemented.\n" , __func__); +pr_info ("%s was not implemented.\n" , __func__);return 0 ; }
@@ -852,7 +852,7 @@ static int pp_dpm_read_sensor(void *handle, int idx, int32_t *value)PP_CHECK_HW (hwmgr);if (hwmgr->hwmgr_func->read_sensor ==NULL ) { -printk (KERN_INFO "%s was not implemented.\n" , __func__); +pr_info ("%s was not implemented.\n" , __func__);return 0 ; }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 4/6 drm/amd/powerplay: update all printk to pr_* on eventmgr
In reply to a message not in the archive--- drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c +1 -1
@@ -151,7 +151,7 @@ static int thermal_interrupt_callback(void *private_data, unsigned src_id, const uint32_t *iv_entry) { /* TO DO hanle PEM_Event_ThermalNotification (struct pp_eventmgr *)private_data*/ - printk("current thermal is out of range \n"); + pr_info("current thermal is out of range \n");return 0 ; }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 5/6 drm/amd/powerplay: update all printk to pr_* on hwmgr
In reply to a message not in the archive--- drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 26 +++++++++++----------- .../gpu/drm/amd/powerplay/hwmgr/functiontables.c | 14 ++++++------ drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 8 +++---- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 6 ++--- .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 4 ++-- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 26 +++++++++++----------- .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 2 +- 7 files changed, 43 insertions(+), 43 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +13 -13
@@ -287,7 +287,7 @@ static int cz_init_dynamic_state_adjustment_rule_settings(kzalloc (table_size,GFP_KERNEL );if (NULL == table_clk_vlt) { -printk (KERN_ERR "[ powerplay ] Can not allocate memory!\n" ); +pr_err ("Can not allocate memory!\n" );return -ENOMEM ; }
@@ -328,12 +328,12 @@ static int cz_get_system_info_data(struct pp_hwmgr *hwmgr) &size, &frev, &crev);if (crev !=9 ) { -printk (KERN_ERR "[ powerplay ] Unsupported IGP table: %d %d\n" , frev, crev); +pr_err ("Unsupported IGP table: %d %d\n" , frev, crev);return -EINVAL ; }if (info ==NULL ) { -printk (KERN_ERR "[ powerplay ] Could not retrieve the Integrated System Info Table!\n" ); +pr_err ("Could not retrieve the Integrated System Info Table!\n" );return -EINVAL ; }
@@ -360,7 +360,7 @@ static int cz_get_system_info_data(struct pp_hwmgr *hwmgr)if (cz_hwmgr->sys_info.htc_tmp_lmt <= cz_hwmgr->sys_info.htc_hyst_lmt) { -printk (KERN_ERR "[ powerplay ] The htcTmpLmt should be larger than htcHystLmt.\n" ); +pr_err ("The htcTmpLmt should be larger than htcHystLmt.\n" );return -EINVAL ; }
@@ -722,7 +722,7 @@ static int cz_tf_update_sclk_limit(struct pp_hwmgr *hwmgr, clock = hwmgr->display_config.min_core_set_clock;if (clock ==0 ) -printk (KERN_INFO "[ powerplay ] min_core_set_clock not set\n" ); +pr_info ("min_core_set_clock not set\n" );if (cz_hwmgr->sclk_dpm.hard_min_clk != clock) { cz_hwmgr->sclk_dpm.hard_min_clk = clock;
@@ -1161,13 +1161,13 @@ static int cz_hwmgr_backend_init(struct pp_hwmgr *hwmgr) result =cz_initialize_dpm_defaults (hwmgr);if (result !=0 ) { -printk (KERN_ERR "[ powerplay ] cz_initialize_dpm_defaults failed\n" ); +pr_err ("cz_initialize_dpm_defaults failed\n" );return result; } result =cz_get_system_info_data (hwmgr);if (result !=0 ) { -printk (KERN_ERR "[ powerplay ] cz_get_system_info_data failed\n" ); +pr_err ("cz_get_system_info_data failed\n" );return result; }
@@ -1176,40 +1176,40 @@ static int cz_hwmgr_backend_init(struct pp_hwmgr *hwmgr) result =phm_construct_table (hwmgr, &cz_setup_asic_master, &(hwmgr->setup_asic));if (result !=0 ) { -printk (KERN_ERR "[ powerplay ] Fail to construct setup ASIC\n" ); +pr_err ("Fail to construct setup ASIC\n" );return result; } result =phm_construct_table (hwmgr, &cz_power_down_asic_master, &(hwmgr->power_down_asic));if (result !=0 ) { -printk (KERN_ERR "[ powerplay ] Fail to construct power down ASIC\n" ); +pr_err ("Fail to construct power down ASIC\n" );return result; } result =phm_construct_table (hwmgr, &cz_disable_dpm_master, &(hwmgr->disable_dynamic_state_management));if (result !=0 ) { -printk (KERN_ERR "[ powerplay ] Fail to disable_dynamic_state\n" ); +pr_err ("Fail to disable_dynamic_state\n" );return result; } result =phm_construct_table (hwmgr, &cz_enable_dpm_master, &(hwmgr->enable_dynamic_state_management));if (result !=0 ) { -printk (KERN_ERR "[ powerplay ] Fail to enable_dynamic_state\n" ); +pr_err ("Fail to enable_dynamic_state\n" );return result; } result =phm_construct_table (hwmgr, &cz_set_power_state_master, &(hwmgr->set_power_state));if (result !=0 ) { -printk (KERN_ERR "[ powerplay ] Fail to construct set_power_state\n" ); +pr_err ("Fail to construct set_power_state\n" );return result; } hwmgr->platform_descriptor.hardwareActivityPerformanceLevels =CZ_MAX_HARDWARE_POWERLEVELS ; result =phm_construct_table (hwmgr, &cz_phm_enable_clock_power_gatings_master, &(hwmgr->enable_clock_power_gatings));if (result !=0 ) { -printk (KERN_ERR "[ powerplay ] Fail to construct enable_clock_power_gatings\n" ); +pr_err ("Fail to construct enable_clock_power_gatings\n" );return result; }return result;
drivers/gpu/drm/amd/powerplay/hwmgr/functiontables.c +7 -7
@@ -35,7 +35,7 @@ static int phm_run_table(struct pp_hwmgr *hwmgr,phm_table_function *function;if (rt_table->function_list ==NULL ) { -pr_debug ("[ powerplay ] this function not implement!\n" ); +pr_debug ("this function not implement!\n" );return 0 ; }
@@ -63,14 +63,14 @@ int phm_dispatch_table(struct pp_hwmgr *hwmgr,void *temp_storage;if (hwmgr ==NULL || rt_table ==NULL ) { -printk (KERN_ERR "[ powerplay ] Invalid Parameter!\n" ); +pr_err ("Invalid Parameter!\n" );return -EINVAL ; }if (0 != rt_table->storage_size) { temp_storage =kzalloc (rt_table->storage_size,GFP_KERNEL );if (temp_storage ==NULL ) { -printk (KERN_ERR "[ powerplay ] Could not allocate table temporary storage\n" ); +pr_err ("Could not allocate table temporary storage\n" );return -ENOMEM ; } }else {
@@ -95,7 +95,7 @@ int phm_construct_table(struct pp_hwmgr *hwmgr,phm_table_function *rtf;if (hwmgr ==NULL || master_table ==NULL || rt_table ==NULL ) { -printk (KERN_ERR "[ powerplay ] Invalid Parameter!\n" ); +pr_err ("Invalid Parameter!\n" );return -EINVAL ; }
@@ -116,7 +116,7 @@ int phm_construct_table(struct pp_hwmgr *hwmgr,for (table_item = master_table->master_list;NULL != table_item->tableFunction; table_item++) {if ((rtf - run_time_list) > function_count) { -printk (KERN_ERR "[ powerplay ] Check function results have changed\n" ); +pr_err ("Check function results have changed\n" );kfree (run_time_list);return -EINVAL ; }
@@ -128,7 +128,7 @@ int phm_construct_table(struct pp_hwmgr *hwmgr, }if ((rtf - run_time_list) > function_count) { -printk (KERN_ERR "[ powerplay ] Check function results have changed\n" ); +pr_err ("Check function results have changed\n" );kfree (run_time_list);return -EINVAL ; }
@@ -144,7 +144,7 @@ int phm_destroy_table(struct pp_hwmgr *hwmgr, struct phm_runtime_table_header *rt_table) {if (hwmgr ==NULL || rt_table ==NULL ) { -printk (KERN_ERR "[ powerplay ] Invalid Parameter\n" ); +pr_err ("Invalid Parameter\n" );return -EINVAL ; }
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +4 -4
@@ -198,7 +198,7 @@ int phm_wait_on_register(struct pp_hwmgr *hwmgr, uint32_t index,uint32_t cur_value;if (hwmgr ==NULL || hwmgr->device ==NULL ) { -printk (KERN_ERR "[ powerplay ] Invalid Hardware Manager!" ); +pr_err ("Invalid Hardware Manager!" );return -EINVAL ; }
@@ -228,7 +228,7 @@ void phm_wait_on_indirect_register(struct pp_hwmgr *hwmgr, uint32_t mask) {if (hwmgr ==NULL || hwmgr->device ==NULL ) { -printk (KERN_ERR "[ powerplay ] Invalid Hardware Manager!" ); +pr_err ("Invalid Hardware Manager!" );return ; }
@@ -550,7 +550,7 @@ int phm_initializa_dynamic_state_adjustment_rule_settings(struct pp_hwmgr *hwmgr table_clk_vlt =kzalloc (table_size,GFP_KERNEL );if (NULL == table_clk_vlt) { -printk (KERN_ERR "[ powerplay ] Can not allocate space for vddc_dep_on_dal_pwrl! \n" ); +pr_err ("Can not allocate space for vddc_dep_on_dal_pwrl! \n" );return -ENOMEM ; }else { table_clk_vlt->count =4 ;
@@ -626,7 +626,7 @@ void phm_apply_dal_min_voltage_request(struct pp_hwmgr *hwmgr)return ; } } -printk (KERN_ERR "DAL requested level can not" +pr_err ("DAL requested level can not" " found a available voltage in VDDC DPM Table \n" ); }
drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c +3 -3
@@ -146,10 +146,10 @@ int atomctrl_initialize_mc_reg_table( GetIndexIntoMasterTable(DATA, VRAM_Info), &size, &frev, &crev);if (module_index >= vram_info->ucNumOfVRAMModule) { -printk (KERN_ERR "[ powerplay ] Invalid VramInfo table." ); +pr_err ("Invalid VramInfo table." ); result =-1 ; }else if (vram_info->sHeader.ucTableFormatRevision <2 ) { -printk (KERN_ERR "[ powerplay ] Invalid VramInfo table." ); +pr_err ("Invalid VramInfo table." ); result =-1 ; }
@@ -689,7 +689,7 @@ int atomctrl_calculate_voltage_evv_on_sclk( fDerateTDP =GetScaledFraction (le32_to_cpu (getASICProfilingInfo->ulTdpDerateDPM7),1000 );break ;default : -printk (KERN_ERR "DPM Level not supported\n" ); +pr_err ("DPM Level not supported\n" ); fPowerDPMx =Convert_ULONG_ToFraction (1 ); fDerateTDP =GetScaledFraction (le32_to_cpu (getASICProfilingInfo->ulTdpDerateDPM0),1000 ); }
drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c +2 -2
@@ -536,7 +536,7 @@ static int get_pcie_table(if ((uint32_t )atom_pcie_table->ucNumEntries <= pcie_count) pcie_count = (uint32_t )atom_pcie_table->ucNumEntries;else -printk (KERN_ERR "[ powerplay ] Number of Pcie Entries exceed the number of SCLK Dpm Levels! \ +pr_err ("Number of Pcie Entries exceed the number of SCLK Dpm Levels! \ Disregarding the excess entries... \n" ); pcie_table->count = pcie_count;
@@ -578,7 +578,7 @@ static int get_pcie_table(if ((uint32_t )atom_pcie_table->ucNumEntries <= pcie_count) pcie_count = (uint32_t )atom_pcie_table->ucNumEntries;else -printk (KERN_ERR "[ powerplay ] Number of Pcie Entries exceed the number of SCLK Dpm Levels! \ +pr_err ("Number of Pcie Entries exceed the number of SCLK Dpm Levels! \ Disregarding the excess entries... \n" ); pcie_table->count = pcie_count;
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +13 -13
@@ -996,7 +996,7 @@ static int smu7_start_dpm(struct pp_hwmgr *hwmgr) SWRST_COMMAND_1, RESETLC, 0x0);if (smu7_enable_sclk_mclk_dpm (hwmgr)) { -printk (KERN_ERR "Failed to enable Sclk DPM and Mclk DPM!" ); +pr_err ("Failed to enable Sclk DPM and Mclk DPM!" );return -EINVAL ; }
@@ -1081,7 +1081,7 @@ static void smu7_set_dpm_event_sources(struct pp_hwmgr *hwmgr, uint32_t sources)switch (sources) {default : -printk (KERN_ERR "Unknown throttling event sources." ); +pr_err ("Unknown throttling event sources." );/* fall through */ case 0 : protection = false;
@@ -1503,7 +1503,7 @@ static int smu7_get_evv_voltages(struct pp_hwmgr *hwmgr) data->vddcgfx_leakage.count++; } }else { -printk ("Error retrieving EVV voltage value!\n" ); +pr_info ("Error retrieving EVV voltage value!\n" ); } } }else {
@@ -1531,7 +1531,7 @@ static int smu7_get_evv_voltages(struct pp_hwmgr *hwmgr)if (vddc >=2000 || vddc ==0 )return -EINVAL ; }else { -printk (KERN_WARNING "failed to retrieving EVV voltage!\n" ); +pr_warning ("failed to retrieving EVV voltage!\n" );continue ; }
@@ -1571,7 +1571,7 @@ static void smu7_patch_ppt_v1_with_vdd_leakage(struct pp_hwmgr *hwmgr, }if (*voltage >ATOM_VIRTUAL_VOLTAGE_ID0 ) -printk (KERN_ERR "Voltage value looks like a Leakage ID but it's not patched \n" ); +pr_err ("Voltage value looks like a Leakage ID but it's not patched \n" ); }/**
@@ -2036,7 +2036,7 @@ static void smu7_patch_ppt_v0_with_vdd_leakage(struct pp_hwmgr *hwmgr, }if (*voltage >ATOM_VIRTUAL_VOLTAGE_ID0 ) -printk (KERN_ERR "Voltage value looks like a Leakage ID but it's not patched \n" ); +pr_err ("Voltage value looks like a Leakage ID but it's not patched \n" ); }
@@ -2289,7 +2289,7 @@ static int smu7_hwmgr_backend_init(struct pp_hwmgr *hwmgr) result =smu7_get_evv_voltages (hwmgr);if (result) { -printk ("Get EVV Voltage Failed. Abort Driver loading!\n" ); +pr_info ("Get EVV Voltage Failed. Abort Driver loading!\n" );return -EINVAL ; }
@@ -2902,11 +2902,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) -printk (KERN_ERR "Single MCLK entry VDDCI/MCLK dependency table " +pr_err ("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) -printk (KERN_ERR "Single VDDCI entry VDDCI/MCLK dependency table " +pr_err ("Single VDDCI entry VDDCI/MCLK dependency table " "does not match VBIOS boot VDDCI level" ); }
@@ -3050,11 +3050,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) -printk (KERN_ERR "Single MCLK entry VDDCI/MCLK dependency table " +pr_err ("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) -printk (KERN_ERR "Single VDDCI entry VDDCI/MCLK dependency table " +pr_err ("Single VDDCI entry VDDCI/MCLK dependency table " "does not match VBIOS boot VDDCI level" ); }
@@ -3594,9 +3594,9 @@ static int smu7_notify_link_speed_change_after_state_change(if (acpi_pcie_perf_request (hwmgr->device, request, false)) {if (PP_PCIEGen2 == target_link_speed) -printk ("PSPP request to switch to Gen2 from Gen3 Failed!" ); +pr_info ("PSPP request to switch to Gen2 from Gen3 Failed!" );else -printk ("PSPP request to switch to Gen1 from Gen2 Failed!" ); +pr_info ("PSPP request to switch to Gen1 from Gen2 Failed!" ); } }
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c +1 -1
@@ -651,7 +651,7 @@ int smu7_enable_power_containment(struct pp_hwmgr *hwmgr) POWERCONTAINMENT_FEATURE_PkgPwrLimit;if (smu7_set_power_limit (hwmgr, default_limit)) -printk (KERN_ERR "Failed to set Default Power Limit in SMC!" ); +pr_err ("Failed to set Default Power Limit in SMC!" ); } } }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 6/6 drm/amd/powerplay: update all printk to pr_* on smumgr
In reply to a message not in the archive--- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 28 +++++++++++----------- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 4 ++-- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 8 +++---- drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 8 +++---- .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 2 +- .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 4 ++-- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 8 +++---- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 12 +++++----- drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 14 +++++------ .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 2 +- 10 files changed, 45 insertions(+), 45 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +14 -14
@@ -70,7 +70,7 @@ static int cz_send_msg_to_smc_async(struct pp_smumgr *smumgr, result =SMUM_WAIT_FIELD_UNEQUAL (smumgr,SMU_MP1_SRBM2P_RESP_0 ,CONTENT ,0 );if (result !=0 ) { -printk (KERN_ERR "[ powerplay ] cz_send_msg_to_smc_async failed\n" ); +pr_err ("cz_send_msg_to_smc_async failed\n" );return result; }
@@ -100,12 +100,12 @@ static int cz_set_smc_sram_address(struct pp_smumgr *smumgr,return -EINVAL ;if (0 != (3 & smc_address)) { -printk (KERN_ERR "[ powerplay ] SMC address must be 4 byte aligned\n" ); +pr_err ("SMC address must be 4 byte aligned\n" );return -EINVAL ; }if (limit <= (smc_address +3 )) { -printk (KERN_ERR "[ powerplay ] SMC address beyond the SMC RAM area\n" ); +pr_err ("SMC address beyond the SMC RAM area\n" );return -EINVAL ; }
@@ -147,7 +147,7 @@ static int cz_request_smu_load_fw(struct pp_smumgr *smumgr)uint32_t smc_address;if (!smumgr->reload_fw) { -printk (KERN_INFO "[ powerplay ] skip reloading...\n" ); +pr_info ("skip reloading...\n" );return 0 ; }
@@ -198,7 +198,7 @@ static int cz_check_fw_load_finish(struct pp_smumgr *smumgr, }if (i >= smumgr->usec_timeout) { -printk (KERN_ERR "[ powerplay ] SMU check loaded firmware failed.\n" ); +pr_err ("SMU check loaded firmware failed.\n" );return -EINVAL ; }
@@ -267,13 +267,13 @@ static int cz_start_smu(struct pp_smumgr *smumgr) ret =cz_request_smu_load_fw (smumgr);if (ret) -printk (KERN_ERR "[ powerplay] SMU firmware load failed\n" ); +pr_err ("SMU firmware load failed\n" );cz_check_fw_load_finish (smumgr, fw_to_check); ret =cz_load_mec_firmware (smumgr);if (ret) -printk (KERN_ERR "[ powerplay ] Mec Firmware load failed\n" ); +pr_err ("Mec Firmware load failed\n" );return ret; }
@@ -406,7 +406,7 @@ static int cz_smu_populate_single_scratch_task(break ;if (i >= cz_smu->scratch_buffer_length) { -printk (KERN_ERR "[ powerplay ] Invalid Firmware Type\n" ); +pr_err ("Invalid Firmware Type\n" );return -EINVAL ; }
@@ -443,7 +443,7 @@ static int cz_smu_populate_single_ucode_load_task(break ;if (i >= cz_smu->driver_buffer_length) { -printk (KERN_ERR "[ powerplay ] Invalid Firmware Type\n" ); +pr_err ("Invalid Firmware Type\n" );return -EINVAL ; }
@@ -774,7 +774,7 @@ static int cz_smu_init(struct pp_smumgr *smumgr) CZ_SCRATCH_ENTRY_UCODE_ID_RLC_SCRATCH, UCODE_ID_RLC_SCRATCH_SIZE_BYTE, &cz_smu->scratch_buffer[cz_smu->scratch_buffer_length++])) { -printk (KERN_ERR "[ powerplay ] Error when Populate Firmware Entry.\n" ); +pr_err ("Error when Populate Firmware Entry.\n" );return -1 ; }
@@ -782,14 +782,14 @@ static int cz_smu_init(struct pp_smumgr *smumgr) CZ_SCRATCH_ENTRY_UCODE_ID_RLC_SRM_ARAM, UCODE_ID_RLC_SRM_ARAM_SIZE_BYTE, &cz_smu->scratch_buffer[cz_smu->scratch_buffer_length++])) { -printk (KERN_ERR "[ powerplay ] Error when Populate Firmware Entry.\n" ); +pr_err ("Error when Populate Firmware Entry.\n" );return -1 ; }if (0 !=cz_smu_populate_single_scratch_entry (smumgr,CZ_SCRATCH_ENTRY_UCODE_ID_RLC_SRM_DRAM ,UCODE_ID_RLC_SRM_DRAM_SIZE_BYTE , &cz_smu->scratch_buffer[cz_smu->scratch_buffer_length++])) { -printk (KERN_ERR "[ powerplay ] Error when Populate Firmware Entry.\n" ); +pr_err ("Error when Populate Firmware Entry.\n" );return -1 ; }
@@ -797,7 +797,7 @@ static int cz_smu_init(struct pp_smumgr *smumgr) CZ_SCRATCH_ENTRY_UCODE_ID_POWER_PROFILING, sizeof(struct SMU8_MultimediaPowerLogData), &cz_smu->scratch_buffer[cz_smu->scratch_buffer_length++])) { -printk (KERN_ERR "[ powerplay ] Error when Populate Firmware Entry.\n" ); +pr_err ("Error when Populate Firmware Entry.\n" );return -1 ; }
@@ -805,7 +805,7 @@ static int cz_smu_init(struct pp_smumgr *smumgr) CZ_SCRATCH_ENTRY_SMU8_FUSION_CLKTABLE, sizeof(struct SMU8_Fusion_ClkTable), &cz_smu->scratch_buffer[cz_smu->scratch_buffer_length++])) { -printk (KERN_ERR "[ powerplay ] Error when Populate Firmware Entry.\n" ); +pr_err ("Error when Populate Firmware Entry.\n" );return -1 ; }cz_smu_construct_toc (smumgr);
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c +2 -2
@@ -2131,7 +2131,7 @@ uint32_t fiji_get_offsetof(uint32_t type, uint32_t member)return offsetof(SMU73_Discrete_DpmTable , LowSclkInterruptThreshold); } } -printk (KERN_WARNING "can't get the offset of type %x member %x\n" , type, member); +pr_warning ("can't get the offset of type %x member %x\n" , type, member);return 0 ; }
@@ -2156,7 +2156,7 @@ uint32_t fiji_get_mac_definition(uint32_t value)return SMU73_MAX_LEVELS_MVDD ; } -printk (KERN_WARNING "can't get the mac of %x\n" , value); +pr_warning ("can't get the mac of %x\n" , value);return 0 ; }
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +4 -4
@@ -179,7 +179,7 @@ static int fiji_setup_pwr_virus(struct pp_smumgr *smumgr) result =0 ;break ;default : -printk (KERN_ERR "Table Exit with Invalid Command!" ); +pr_err ("Table Exit with Invalid Command!" ); priv->avfs.AvfsBtcStatus =AVFS_BTC_VIRUS_FAIL ; result =-1 ;break ;
@@ -202,13 +202,13 @@ static int fiji_start_avfs_btc(struct pp_smumgr *smumgr) priv->avfs.AvfsBtcStatus =AVFS_BTC_COMPLETED_UNSAVED ; result =0 ; }else { -printk (KERN_ERR "[AVFS][fiji_start_avfs_btc] Attempt" +pr_err ("[AVFS][fiji_start_avfs_btc] Attempt" " to Enable AVFS Failed!" );smum_send_msg_to_smc (smumgr, PPSMC_MSG_DisableAvfs); result =-1 ; } }else { -printk (KERN_ERR "[AVFS][fiji_start_avfs_btc] " +pr_err ("[AVFS][fiji_start_avfs_btc] " "PerformBTC SMU msg failed" ); result =-1 ; }
@@ -384,7 +384,7 @@ static int fiji_avfs_event_mgr(struct pp_smumgr *smumgr, bool smu_started)case AVFS_BTC_NOTSUPPORTED :/* Do nothing */ break ;default : -printk (KERN_ERR "[AVFS] Something is broken. See log!" ); +pr_err ("[AVFS] Something is broken. See log!" );break ; }return 0 ;
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c +4 -4
@@ -1545,7 +1545,7 @@ static int iceland_populate_smc_boot_level(struct pp_hwmgr *hwmgr,if (0 != result) { smu_data->smc_state_table.GraphicsBootLevel =0 ; -printk (KERN_ERR "[ powerplay ] VBIOS did not find boot engine clock value \ +pr_err ("VBIOS did not find boot engine clock value \ in dependency table. Using Graphics DPM level 0!" ); result =0 ; }
@@ -1556,7 +1556,7 @@ static int iceland_populate_smc_boot_level(struct pp_hwmgr *hwmgr,if (0 != result) { smu_data->smc_state_table.MemoryBootLevel =0 ; -printk (KERN_ERR "[ powerplay ] VBIOS did not find boot engine clock value \ +pr_err ("VBIOS did not find boot engine clock value \ in dependency table. Using Memory DPM level 0!" ); result =0 ; }
@@ -2146,7 +2146,7 @@ uint32_t iceland_get_offsetof(uint32_t type, uint32_t member)return offsetof(SMU71_Discrete_DpmTable , LowSclkInterruptThreshold); } } -printk (KERN_WARNING "can't get the offset of type %x member %x\n" , type, member); +pr_warning ("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 ; } -printk (KERN_WARNING "can't get the mac of %x\n" , value); +pr_warning ("can't get the mac of %x\n" , value);return 0 ; }
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c +1 -1
@@ -176,7 +176,7 @@ static int iceland_start_smu(struct pp_smumgr *smumgr)return result;if (!smu7_is_smc_ram_running (smumgr)) { -printk ("smu not running, upload firmware again \n" ); +pr_info ("smu not running, upload firmware again \n" ); result =iceland_smu_upload_firmware_image (smumgr);if (result)return result;
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c +2 -2
@@ -2180,7 +2180,7 @@ uint32_t polaris10_get_offsetof(uint32_t type, uint32_t member)return offsetof(SMU74_Discrete_DpmTable , LowSclkInterruptThreshold); } } -printk (KERN_WARNING "can't get the offset of type %x member %x\n" , type, member); +pr_warning ("can't get the offset of type %x member %x\n" , type, member);return 0 ; }
@@ -2207,7 +2207,7 @@ uint32_t polaris10_get_mac_definition(uint32_t value)return SMU7_UVD_MCLK_HANDSHAKE_DISABLE ; } -printk (KERN_WARNING "can't get the mac of %x\n" , value); +pr_warning ("can't get the mac of %x\n" , value);return 0 ; }
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +4 -4
@@ -84,7 +84,7 @@ static int polaris10_setup_pwr_virus(struct pp_smumgr *smumgr)break ;default : -printk ("Table Exit with Invalid Command!" ); +pr_info ("Table Exit with Invalid Command!" ); smu_data->avfs.avfs_btc_status =AVFS_BTC_VIRUS_FAIL ; result =-1 ;break ;
@@ -102,7 +102,7 @@ static int polaris10_perform_btc(struct pp_smumgr *smumgr)if (0 != smu_data->avfs.avfs_btc_param) {if (0 !=smu7_send_msg_to_smc_with_parameter (smumgr, PPSMC_MSG_PerformBtc, smu_data->avfs.avfs_btc_param)) { -printk ("[AVFS][SmuPolaris10_PerformBtc] PerformBTC SMU msg failed" ); +pr_info ("[AVFS][SmuPolaris10_PerformBtc] PerformBTC SMU msg failed" ); result =-1 ; } }
@@ -189,7 +189,7 @@ polaris10_avfs_event_mgr(struct pp_smumgr *smumgr, bool SMU_VFT_INTACT) return -1);if (smu_data->avfs.avfs_btc_param >1 ) { -printk ("[AVFS][Polaris10_AVFSEventMgr] AC BTC has not been successfully verified on Fiji. There may be in this setting." ); +pr_info ("[AVFS][Polaris10_AVFSEventMgr] AC BTC has not been successfully verified on Fiji. There may be in this setting." ); smu_data->avfs.avfs_btc_status =AVFS_BTC_VIRUS_FAIL ; PP_ASSERT_WITH_CODE(-1 == polaris10_setup_pwr_virus(smumgr), "[AVFS][Polaris10_AVFSEventMgr] Could not setup Pwr Virus for AVFS ",
@@ -208,7 +208,7 @@ polaris10_avfs_event_mgr(struct pp_smumgr *smumgr, bool SMU_VFT_INTACT)break ;default : -printk ("[AVFS] Something is broken. See log!" ); +pr_info ("[AVFS] Something is broken. See log!" );break ; }
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +6 -6
@@ -175,7 +175,7 @@ int smu7_send_msg_to_smc(struct pp_smumgr *smumgr, uint16_t msg) ret =SMUM_READ_FIELD (smumgr->device,SMC_RESP_0 ,SMC_RESP );if (ret !=1 ) -printk ("\n failed to send pre message %x ret is %d \n" , msg, ret); +pr_info ("\n failed to send pre message %x ret is %d \n" , msg, ret);cgs_write_register (smumgr->device, mmSMC_MESSAGE_0, msg);
@@ -184,7 +184,7 @@ int smu7_send_msg_to_smc(struct pp_smumgr *smumgr, uint16_t msg) ret =SMUM_READ_FIELD (smumgr->device,SMC_RESP_0 ,SMC_RESP );if (ret !=1 ) -printk ("\n failed to send message %x ret is %d \n" , msg, ret); +pr_info ("\n failed to send message %x ret is %d \n" , msg, ret);return 0 ; }
@@ -225,7 +225,7 @@ int smu7_send_msg_to_smc_offset(struct pp_smumgr *smumgr)SMUM_WAIT_FIELD_UNEQUAL (smumgr,SMC_RESP_0 ,SMC_RESP ,0 );if (1 !=SMUM_READ_FIELD (smumgr->device,SMC_RESP_0 ,SMC_RESP )) -printk ("Failed to send Message.\n" ); +pr_info ("Failed to send Message.\n" );return 0 ; }
@@ -347,7 +347,7 @@ static uint32_t smu7_get_mask_for_firmware_type(uint32_t fw_type) result =UCODE_ID_RLC_G_MASK ;break ;default : -printk ("UCode type is out of range! \n" ); +pr_info ("UCode type is out of range! \n" ); result =0 ; }
@@ -396,7 +396,7 @@ int smu7_request_smu_load_fw(struct pp_smumgr *smumgr)struct SMU_DRAMData_TOC *toc;if (!smumgr->reload_fw) { -printk (KERN_INFO "[ powerplay ] skip reloading...\n" ); +pr_info ("skip reloading...\n" );return 0 ; }
@@ -474,7 +474,7 @@ int smu7_request_smu_load_fw(struct pp_smumgr *smumgr)smu7_send_msg_to_smc_with_parameter (smumgr,PPSMC_MSG_DRV_DRAM_ADDR_LO , smu_data->header_buffer.mc_addr_low);if (smu7_send_msg_to_smc_with_parameter (smumgr, PPSMC_MSG_LoadUcodes, fw_to_load)) -printk (KERN_ERR "Fail to Request SMU Load uCode" ); +pr_err ("Fail to Request SMU Load uCode" );return result; }
drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c +7 -7
@@ -656,7 +656,7 @@ int tonga_populate_all_graphic_levels(struct pp_hwmgr *hwmgr) } }else {if (0 == data->dpm_level_enable_mask.pcie_dpm_enable_mask) -printk (KERN_ERR "[ powerplay ] Pcie Dpm Enablemask is 0 !" ); +pr_err ("Pcie Dpm Enablemask is 0 !" ); while (data->dpm_level_enable_mask.pcie_dpm_enable_mask && ((data->dpm_level_enable_mask.pcie_dpm_enable_mask &
@@ -1503,7 +1503,7 @@ static int tonga_populate_smc_boot_level(struct pp_hwmgr *hwmgr,if (result !=0 ) { smu_data->smc_state_table.GraphicsBootLevel =0 ; -printk (KERN_ERR "[powerplay] VBIOS did not find boot engine " +pr_err ("[powerplay] VBIOS did not find boot engine " "clock value in dependency table. " "Using Graphics DPM level 0 !" ); result =0 ;
@@ -1515,7 +1515,7 @@ static int tonga_populate_smc_boot_level(struct pp_hwmgr *hwmgr,if (result !=0 ) { smu_data->smc_state_table.MemoryBootLevel =0 ; -printk (KERN_ERR "[powerplay] VBIOS did not find boot " +pr_err ("[powerplay] VBIOS did not find boot " "engine clock value in dependency table." "Using Memory DPM level 0 !" ); result =0 ;
@@ -1739,7 +1739,7 @@ static int tonga_populate_vr_config(struct pp_hwmgr *hwmgr, config =VR_SVI2_PLANE_2 ; table->VRConfig |= config; }else { -printk (KERN_ERR "[ powerplay ] VDDC and VDDGFX should " +pr_err ("VDDC and VDDGFX should " "be both on SVI2 control in splitted mode !\n" ); } }else {
@@ -1752,7 +1752,7 @@ static int tonga_populate_vr_config(struct pp_hwmgr *hwmgr, config =VR_SVI2_PLANE_1 ; table->VRConfig |= config; }else { -printk (KERN_ERR "[ powerplay ] VDDC should be on " +pr_err ("VDDC should be on " "SVI2 control in merged mode !\n" ); } }
@@ -2657,7 +2657,7 @@ uint32_t tonga_get_offsetof(uint32_t type, uint32_t member)return offsetof(SMU72_Discrete_DpmTable , LowSclkInterruptThreshold); } } -printk (KERN_WARNING "can't get the offset of type %x member %x\n" , type, member); +pr_warning ("can't get the offset of type %x member %x\n" , type, member);return 0 ; }
@@ -2681,7 +2681,7 @@ uint32_t tonga_get_mac_definition(uint32_t value)case SMU_MAX_LEVELS_MVDD :return SMU72_MAX_LEVELS_MVDD ; } -printk (KERN_WARNING "can't get the mac value %x\n" , value); +pr_warning ("can't get the mac value %x\n" , value);return 0 ; }
drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c +1 -1
@@ -84,7 +84,7 @@ static int tonga_start_in_protection_mode(struct pp_smumgr *smumgr)/* Check pass/failed indicator */ if (1 !=SMUM_READ_VFPF_INDIRECT_FIELD (smumgr->device,CGS_IND_REG__SMC ,SMU_STATUS ,SMU_PASS )) { -printk (KERN_ERR "[ powerplay ] SMU Firmware start failed\n" ); +pr_err ("SMU Firmware start failed\n" );return -EINVAL ; }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Edward O'Callaghan
Reviewed-byMerry Christmas Huang Rui,
This set looks way better and a much more complete solution, good job working though it all!
Patches 1-6 are,
Kindest Regards,
Edward.
Quoted 41 lines · Huang Rui
From: Huang Rui <[email protected]>
Hi all,
Merry Christmas! No one generate patches at this time except us :-).
The following patch set doesn't have any function change, just refine prints of powerplay. Powerplay will used pr_* instead of raw printk, and we can dynamic change the debug level with it.
The prefix is like below:
[ xxx.xxxxxx] amdgpu: [powerplay] ...
Best Wishes,
RuiHuang Rui (6):
drm/amd/powerplay: add prefix for all powerplay pr_* prints drm/amd/powerplay: reshuffle headers to makepr_fmtmacro before<linux/xxx.h>drm/amd/powerplay: refine print message for
amd_powerplaydrm/amd/powerplay: update all printk to pr_* on eventmgr drm/amd/powerplay: update all printk to pr_* on hwmgr drm/amd/powerplay: update all printk to pr_* on smumgrdrivers/gpu/drm/amd/powerplay/amd_powerplay.c | 50 +++++++++++----------- drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 29 ++++++------- .../gpu/drm/amd/powerplay/hwmgr/functiontables.c | 14 +++--- .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 11 ++--- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 8 ++-- .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 6 +-- .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 28 ++++++------ .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 4 +- drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 10 ++++- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 28 ++++++------ drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 6 +-- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 10 ++---
Quoted 9 lines
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 10 ++--- .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 4 +- .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 6 +-- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 10 ++--- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 14 +++--- drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 16 +++---- .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 4 +- 22 files changed, 140 insertions(+), 134 deletions(-)
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx