Commit 55084d7f authored Jun 05, 2020 by Evan Quan Committed by Alex Deucher Jul 01, 2020

drm/amd/powerplay: forbid to use pr_err/warn/info/debug



Use dev_err/warn/info/dbg instead. They are more MGPU friendly.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent d9811cfc

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,16 @@
		#include "sienna_cichlid_ppt.h"
		#include "renoir_ppt.h"

		/*
		* DO NOT use these for err/warn/info/debug messages.
		* Use dev_err, dev_warn, dev_info and dev_dbg instead.
		* They are more MGPU friendly.
		*/
		#undef pr_err
		#undef pr_warn
		#undef pr_info
		#undef pr_debug

		#undef __SMU_DUMMY_MAP
		#define __SMU_DUMMY_MAP(type) #type
		static const char* __smu_message_names[] = {

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,16 @@
		#include <linux/pci.h>
		#include "amdgpu_ras.h"

		/*
		* DO NOT use these for err/warn/info/debug messages.
		* Use dev_err, dev_warn, dev_info and dev_dbg instead.
		* They are more MGPU friendly.
		*/
		#undef pr_err
		#undef pr_warn
		#undef pr_info
		#undef pr_debug

		#define to_amdgpu_device(x) (container_of(x, struct amdgpu_device, pm.smu_i2c))

		#define CTF_OFFSET_EDGE 5

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,16 @@

		#include "asic_reg/mp/mp_11_0_sh_mask.h"

		/*
		* DO NOT use these for err/warn/info/debug messages.
		* Use dev_err, dev_warn, dev_info and dev_dbg instead.
		* They are more MGPU friendly.
		*/
		#undef pr_err
		#undef pr_warn
		#undef pr_info
		#undef pr_debug

		#define FEATURE_MASK(feature) (1ULL << feature)
		#define SMC_DPM_FEATURE ( \
		FEATURE_MASK(FEATURE_DPM_PREFETCHER_BIT) \| \

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,15 @@
		#include "smu_v12_0.h"
		#include "renoir_ppt.h"

		/*
		* DO NOT use these for err/warn/info/debug messages.
		* Use dev_err, dev_warn, dev_info and dev_dbg instead.
		* They are more MGPU friendly.
		*/
		#undef pr_err
		#undef pr_warn
		#undef pr_info
		#undef pr_debug

		#define CLK_MAP(clk, index) \
		[SMU_##clk] = {1, (index)}

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,16 @@

		#include "asic_reg/mp/mp_11_0_sh_mask.h"

		/*
		* DO NOT use these for err/warn/info/debug messages.
		* Use dev_err, dev_warn, dev_info and dev_dbg instead.
		* They are more MGPU friendly.
		*/
		#undef pr_err
		#undef pr_warn
		#undef pr_info
		#undef pr_debug

		#define FEATURE_MASK(feature) (1ULL << feature)
		#define SMC_DPM_FEATURE ( \
		FEATURE_MASK(FEATURE_DPM_PREFETCHER_BIT) \| \