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

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

drivers/gpu/drm/amd/powerplay/amd_powerplay.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ 
 * OTHER DEALINGS IN THE SOFTWARE.

 *

 */

#include "pp_debug.h"

#include <linux/module.h>

#include <linux/slab.h>



#include "ppatomctrl.h"

#include "atombios.h"

#include "cgs_common.h"

#include "pp_debug.h"

#include "ppevvmath.h"



#define MEM_ID_MASK           0xff000000

CRA Git | Maintained and supported by SUSTech CRA and CCSE