Commit 7bd55429 authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher

drm/amd/powerplay: reshuffle headers to make pr_fmt macro before <linux/xxx.h>

This 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,
Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarEdward O'Callaghan <funfunctor@folklore1984.net>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7739b1e7
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
* *
*/ */
#include "pp_debug.h"
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/gfp.h> #include <linux/gfp.h>
...@@ -29,7 +30,6 @@ ...@@ -29,7 +30,6 @@
#include "pp_instance.h" #include "pp_instance.h"
#include "power_state.h" #include "power_state.h"
#include "eventmanager.h" #include "eventmanager.h"
#include "pp_debug.h"
#define PP_CHECK(handle) \ #define PP_CHECK(handle) \
......
...@@ -20,13 +20,13 @@ ...@@ -20,13 +20,13 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
* *
*/ */
#include "pp_debug.h"
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "atom-types.h" #include "atom-types.h"
#include "atombios.h" #include "atombios.h"
#include "processpptables.h" #include "processpptables.h"
#include "pp_debug.h"
#include "cgs_common.h" #include "cgs_common.h"
#include "smu/smu_8_0_d.h" #include "smu/smu_8_0_d.h"
#include "smu8_fusion.h" #include "smu8_fusion.h"
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#include "cz_hwmgr.h" #include "cz_hwmgr.h"
#include "power_state.h" #include "power_state.h"
#include "cz_clockpowergating.h" #include "cz_clockpowergating.h"
#include "pp_debug.h"
#define ixSMUSVI_NB_CURRENTVID 0xD8230044 #define ixSMUSVI_NB_CURRENTVID 0xD8230044
#define CURRENT_NB_VID_MASK 0xff000000 #define CURRENT_NB_VID_MASK 0xff000000
......
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
* *
*/ */
#include "pp_debug.h"
#include <linux/errno.h> #include <linux/errno.h>
#include "hwmgr.h" #include "hwmgr.h"
#include "hardwaremanager.h" #include "hardwaremanager.h"
#include "power_state.h" #include "power_state.h"
#include "pp_debug.h"
#define PHM_FUNC_CHECK(hw) \ #define PHM_FUNC_CHECK(hw) \
do { \ do { \
......
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
* *
*/ */
#include "pp_debug.h"
#include "linux/delay.h" #include "linux/delay.h"
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
...@@ -29,7 +31,6 @@ ...@@ -29,7 +31,6 @@
#include "power_state.h" #include "power_state.h"
#include "hwmgr.h" #include "hwmgr.h"
#include "pppcielanes.h" #include "pppcielanes.h"
#include "pp_debug.h"
#include "ppatomctrl.h" #include "ppatomctrl.h"
#include "ppsmc.h" #include "ppsmc.h"
#include "pp_acpi.h" #include "pp_acpi.h"
......
...@@ -20,13 +20,13 @@ ...@@ -20,13 +20,13 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
* *
*/ */
#include "pp_debug.h"
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "ppatomctrl.h" #include "ppatomctrl.h"
#include "atombios.h" #include "atombios.h"
#include "cgs_common.h" #include "cgs_common.h"
#include "pp_debug.h"
#include "ppevvmath.h" #include "ppevvmath.h"
#define MEM_ID_MASK 0xff000000 #define MEM_ID_MASK 0xff000000
......
...@@ -20,13 +20,13 @@ ...@@ -20,13 +20,13 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
* *
*/ */
#include "pp_debug.h"
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "process_pptables_v1_0.h" #include "process_pptables_v1_0.h"
#include "ppatomctrl.h" #include "ppatomctrl.h"
#include "atombios.h" #include "atombios.h"
#include "pp_debug.h"
#include "hwmgr.h" #include "hwmgr.h"
#include "cgs_common.h" #include "cgs_common.h"
#include "pptable_v1_0.h" #include "pptable_v1_0.h"
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
* *
*/ */
#include "pp_debug.h"
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -27,7 +28,6 @@ ...@@ -27,7 +28,6 @@
#include "processpptables.h" #include "processpptables.h"
#include <atom-types.h> #include <atom-types.h>
#include <atombios.h> #include <atombios.h>
#include "pp_debug.h"
#include "pptable.h" #include "pptable.h"
#include "power_state.h" #include "power_state.h"
#include "hwmgr.h" #include "hwmgr.h"
......
...@@ -20,13 +20,13 @@ ...@@ -20,13 +20,13 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
* *
*/ */
#include "pp_debug.h"
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/fb.h> #include <linux/fb.h>
#include <asm/div64.h> #include <asm/div64.h>
#include "linux/delay.h" #include "linux/delay.h"
#include "pp_acpi.h" #include "pp_acpi.h"
#include "pp_debug.h"
#include "ppatomctrl.h" #include "ppatomctrl.h"
#include "atombios.h" #include "atombios.h"
#include "pptable_v1_0.h" #include "pptable_v1_0.h"
......
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
* *
*/ */
#include "pp_debug.h"
#include "hwmgr.h" #include "hwmgr.h"
#include "smumgr.h" #include "smumgr.h"
#include "smu7_hwmgr.h" #include "smu7_hwmgr.h"
#include "smu7_powertune.h" #include "smu7_powertune.h"
#include "pp_debug.h"
#include "smu7_common.h" #include "smu7_common.h"
#define VOLTAGE_SCALE 4 #define VOLTAGE_SCALE 4
......
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
* *
*/ */
#include "pp_debug.h"
#include "fiji_smc.h" #include "fiji_smc.h"
#include "smu7_dyn_defaults.h" #include "smu7_dyn_defaults.h"
#include "smu7_hwmgr.h" #include "smu7_hwmgr.h"
#include "hardwaremanager.h" #include "hardwaremanager.h"
#include "ppatomctrl.h" #include "ppatomctrl.h"
#include "pp_debug.h"
#include "cgs_common.h" #include "cgs_common.h"
#include "atombios.h" #include "atombios.h"
#include "fiji_smumgr.h" #include "fiji_smumgr.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
* *
*/ */
#include "pp_debug.h"
#include "smumgr.h" #include "smumgr.h"
#include "smu73.h" #include "smu73.h"
#include "smu_ucode_xfer_vi.h" #include "smu_ucode_xfer_vi.h"
...@@ -36,7 +37,6 @@ ...@@ -36,7 +37,6 @@
#include "gca/gfx_8_0_d.h" #include "gca/gfx_8_0_d.h"
#include "bif/bif_5_0_d.h" #include "bif/bif_5_0_d.h"
#include "bif/bif_5_0_sh_mask.h" #include "bif/bif_5_0_sh_mask.h"
#include "pp_debug.h"
#include "fiji_pwrvirus.h" #include "fiji_pwrvirus.h"
#include "fiji_smc.h" #include "fiji_smc.h"
......
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
* *
*/ */
#include "pp_debug.h"
#include "iceland_smc.h" #include "iceland_smc.h"
#include "smu7_dyn_defaults.h" #include "smu7_dyn_defaults.h"
#include "smu7_hwmgr.h" #include "smu7_hwmgr.h"
#include "hardwaremanager.h" #include "hardwaremanager.h"
#include "ppatomctrl.h" #include "ppatomctrl.h"
#include "pp_debug.h"
#include "cgs_common.h" #include "cgs_common.h"
#include "atombios.h" #include "atombios.h"
#include "pppcielanes.h" #include "pppcielanes.h"
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* Author: Huang Rui <ray.huang@amd.com> * Author: Huang Rui <ray.huang@amd.com>
* *
*/ */
#include "pp_debug.h"
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -29,7 +30,6 @@ ...@@ -29,7 +30,6 @@
#include "smumgr.h" #include "smumgr.h"
#include "iceland_smumgr.h" #include "iceland_smumgr.h"
#include "pp_debug.h"
#include "smu_ucode_xfer_vi.h" #include "smu_ucode_xfer_vi.h"
#include "ppsmc.h" #include "ppsmc.h"
#include "smu/smu_7_1_1_d.h" #include "smu/smu_7_1_1_d.h"
......
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
* *
*/ */
#include "pp_debug.h"
#include "polaris10_smc.h" #include "polaris10_smc.h"
#include "smu7_dyn_defaults.h" #include "smu7_dyn_defaults.h"
#include "smu7_hwmgr.h" #include "smu7_hwmgr.h"
#include "hardwaremanager.h" #include "hardwaremanager.h"
#include "ppatomctrl.h" #include "ppatomctrl.h"
#include "pp_debug.h"
#include "cgs_common.h" #include "cgs_common.h"
#include "atombios.h" #include "atombios.h"
#include "polaris10_smumgr.h" #include "polaris10_smumgr.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
* *
*/ */
#include "pp_debug.h"
#include "smumgr.h" #include "smumgr.h"
#include "smu74.h" #include "smu74.h"
#include "smu_ucode_xfer_vi.h" #include "smu_ucode_xfer_vi.h"
...@@ -36,7 +37,6 @@ ...@@ -36,7 +37,6 @@
#include "bif/bif_5_0_sh_mask.h" #include "bif/bif_5_0_sh_mask.h"
#include "polaris10_pwrvirus.h" #include "polaris10_pwrvirus.h"
#include "ppatomctrl.h" #include "ppatomctrl.h"
#include "pp_debug.h"
#include "cgs_common.h" #include "cgs_common.h"
#include "polaris10_smc.h" #include "polaris10_smc.h"
#include "smu7_ppsmc.h" #include "smu7_ppsmc.h"
......
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
*/ */
#include "pp_debug.h"
#include "smumgr.h" #include "smumgr.h"
#include "smu_ucode_xfer_vi.h" #include "smu_ucode_xfer_vi.h"
#include "smu/smu_7_1_3_d.h" #include "smu/smu_7_1_3_d.h"
#include "smu/smu_7_1_3_sh_mask.h" #include "smu/smu_7_1_3_sh_mask.h"
#include "ppatomctrl.h" #include "ppatomctrl.h"
#include "pp_debug.h"
#include "cgs_common.h" #include "cgs_common.h"
#include "smu7_ppsmc.h" #include "smu7_ppsmc.h"
#include "smu7_smumgr.h" #include "smu7_smumgr.h"
......
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
* *
*/ */
#include "pp_debug.h"
#include "tonga_smc.h" #include "tonga_smc.h"
#include "smu7_dyn_defaults.h" #include "smu7_dyn_defaults.h"
#include "smu7_hwmgr.h" #include "smu7_hwmgr.h"
#include "hardwaremanager.h" #include "hardwaremanager.h"
#include "ppatomctrl.h" #include "ppatomctrl.h"
#include "pp_debug.h"
#include "cgs_common.h" #include "cgs_common.h"
#include "atombios.h" #include "atombios.h"
#include "tonga_smumgr.h" #include "tonga_smumgr.h"
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
* *
*/ */
#include "pp_debug.h"
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -27,7 +28,6 @@ ...@@ -27,7 +28,6 @@
#include "smumgr.h" #include "smumgr.h"
#include "tonga_smumgr.h" #include "tonga_smumgr.h"
#include "pp_debug.h"
#include "smu_ucode_xfer_vi.h" #include "smu_ucode_xfer_vi.h"
#include "tonga_ppsmc.h" #include "tonga_ppsmc.h"
#include "smu/smu_7_1_2_d.h" #include "smu/smu_7_1_2_d.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment