drm/amd/powerplay: add prefix for all powerplay pr_* prints
Subsystems (2)
PATCH 1/2 drm/amd/powerplay: add prefix for all powerplay pr_* prints
Powerplay will be used them instead of raw printk, and we can dynamic change the debug level with it.
The prefix is like below:
[ 197.755167] [powerplay] amdgpu: powerplay initialized
--- 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/inc/pp_debug.h | 10 ++++++++-- 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 +- 19 files changed, 27 insertions(+), 21 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/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) "[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__); \ + if(0)pr_info(fmt, ##__VA_ARGS__); \ } while (0)
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
A message that is not in the archive (sent off-list or not yet received): 1482461108-8463-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/amd/powerplay: update pp_dbg_log print to pr_debug level
--- drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/inc/pp_debug.h +1 -1
@@ -45,7 +45,7 @@#define PP_DBG_LOG (fmt, ...) \ do { \ - if(0)pr_info(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
Edward O'Callaghan
Acked-byHi,
I would say drop all the header relocation churn, it distracts away from the functional changes in this commit. Also see inline comments.
With those fixes,
Kindest Regards,
Edward.
Quoted 6 lines · Huang Rui
Powerplay will be used them instead of raw printk, and we can dynamic change the debug level with it.
The prefix is like below:
[ 197.755167] [powerplay] amdgpu: powerplay initialized
Ideally I think it would be better to look like this:
[ xxx.xxxxxx ] amdgpu: [powerplay] initialized.
but certainly drop repeating "powerplay" twice..
Quoted 234 lines
Suggested-by Grazvydas Ignotas <[email protected]>Signed-off-by Huang Rui <[email protected]>Cc Arindam Nath <[email protected]>--- 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/inc/pp_debug.h | 10 ++++++++-- 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 +- 19 files changed, 27 insertions(+), 21 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 0xff000000drivers/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 0xff000000drivers/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 4drivers/gpu/drm/amd/powerplay/inc/pp_debug.h +7
-1@@ -24,6 +24,12 @@#ifndef PP_DEBUG_H #define PP_DEBUG_H +#ifdef pr_fmt +#undef pr_fmt +#endif + +#define pr_fmt (fmt) "[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)
drivers/gpu/drm/amd/powerplay/inc/pp_debug.h line 48
Quoted 5 lines
drivers/gpu/drm/amd/powerplay/inc/pp_debug.h +1
-1@@ -39,7 +45,7 @@#define PP_DBG_LOG (fmt, ...) \ do { \ - if(0)printk(KERN_INFO "[ pp_dbg ] " fmt, ##__VA_ARGS__); \ + if(0)pr_info(fmt, ##__VA_ARGS__); \
Just squash the next commit into this one to remove the 'if(0)' cond.
Quoted 171 lines
drivers/gpu/drm/amd/powerplay/inc/pp_debug.h +0
-0}while (0 )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
-0@@ -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>
drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c line 33
Quoted 7 lines
drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c +0
-1@@ -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"
_______________________________________________
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): a4500215-e3d3-fd84-2444-f028241f6c4a-dczkZgxz+BNUPWh3PAxdjQ@public.gmane.org
Quoted 5 lines · Edward O'Callaghan
Hi,
I would say drop all the header relocation churn, it distracts away from the functional changes in this commit. Also see inline comments.
Yes, if double check undef, it needn't move macro before <linux/xxx.h>
Quoted 12 lines
With those fixes,
Kindest Regards,
Edward.Quoted 5 lines · Huang Rui
Powerplay will be used them instead of raw printk, and we can dynamic change the debug level with it.
The prefix is like below:
Quoted 8 lines
Quoted 1 line
[ 197.755167] [powerplay] amdgpu: powerplay initializedIdeally I think it would be better to look like this:
[ xxx.xxxxxx ] amdgpu: [powerplay] initialized.
but certainly drop repeating "powerplay" twice..
We define it as below:
#define pr_fmt(fmt) "amdgpu: [powerplay] " fmt
But we need refine most detail prints message with more patches in the codes.
Quoted 235 lines
Quoted 235 lines
Suggested-by Grazvydas Ignotas <[email protected]>Signed-off-by Huang Rui <[email protected]>Cc Arindam Nath <[email protected]>--- 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/inc/pp_debug.h | 10 ++++++++-- 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 +- 19 files changed, 27 insertions(+), 21 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 0xff000000drivers/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 0xff000000drivers/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 4drivers/gpu/drm/amd/powerplay/inc/pp_debug.h +7
-1@@ -24,6 +24,12 @@#ifndef PP_DEBUG_H #define PP_DEBUG_H +#ifdef pr_fmt +#undef pr_fmt +#endif + +#define pr_fmt (fmt) "[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 @@
Quoted 7 lines
drivers/gpu/drm/amd/powerplay/inc/pp_debug.h line 48
Quoted 4 lines
drivers/gpu/drm/amd/powerplay/inc/pp_debug.h +1
-1#define PP_DBG_LOG (fmt, ...) \ do { \ - if(0)printk(KERN_INFO "[ pp_dbg ] " fmt, ##__VA_ARGS__); \ + if(0)pr_info(fmt, ##__VA_ARGS__); \Just squash the next commit into this one to remove the 'if(0)' cond.
Actually, this patch just adds prefix. "remove 'if(0)'" is another behavior even it's minor change.
Anyway, I am fine to squash it.
Thanks,
Rui
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 8 lines · Huang Rui
Quoted 5 lines · Edward O'Callaghan
Hi,
I would say drop all the header relocation churn, it distracts away from the functional changes in this commit. Also see inline comments.
Yes, if double check undef, it needn't move macro before <
linux/xxx.h>
If you want to reshuffle headers I would say that is a seperate patch and the functional changes as their own changeset. That's my view any way.
Quoted 22 lines
Quoted 13 lines
With those fixes,
Kindest Regards,
Edward.Quoted 5 lines · Huang Rui
Powerplay will be used them instead of raw printk, and we can dynamic change the debug level with it.
The prefix is like below:
Quoted 8 lines
Quoted 1 line
[ 197.755167] [powerplay] amdgpu: powerplay initializedIdeally I think it would be better to look like this:
[ xxx.xxxxxx ] amdgpu: [powerplay] initialized.
but certainly drop repeating "powerplay" twice..
Quoted 6 lines
We define it as below:
#define
pr_fmt(fmt)"amdgpu: [powerplay] " fmtBut we need refine most detail prints message with more patches in the codes.
I suggest if your going to touch it you may as well go all the way and get the thing fixed up properly, then its done.
Quoted 244 lines
Quoted 236 lines
Quoted 236 lines
Suggested-by Grazvydas Ignotas <[email protected]>Signed-off-by Huang Rui <[email protected]>Cc Arindam Nath <[email protected]>--- 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/inc/pp_debug.h | 10 ++++++++-- 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 +- 19 files changed, 27 insertions(+), 21 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 0xff000000drivers/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 0xff000000drivers/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 4drivers/gpu/drm/amd/powerplay/inc/pp_debug.h +7
-1@@ -24,6 +24,12 @@#ifndef PP_DEBUG_H #define PP_DEBUG_H +#ifdef pr_fmt +#undef pr_fmt +#endif + +#define pr_fmt (fmt) "[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 @@Quoted 7 lines
drivers/gpu/drm/amd/powerplay/inc/pp_debug.h line 48
Quoted 4 lines
drivers/gpu/drm/amd/powerplay/inc/pp_debug.h +1
-1#define PP_DBG_LOG (fmt, ...) \ do { \ - if(0)printk(KERN_INFO "[ pp_dbg ] " fmt, ##__VA_ARGS__); \ + if(0)pr_info(fmt, ##__VA_ARGS__); \Just squash the next commit into this one to remove the 'if(0)' cond.
Quoted 4 lines
Actually, this patch just adds prefix. "remove 'if(0)'" is another behavior even it's minor change.
Anyway, I am fine to squash it.
Yes, just to make clear - squash it with the other functional change as they are interdependent and keep the pure header churn as a separate patch.
Quoted 4 lines
Thanks,
Rui
Cheers,
Edward.
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx