1 files changed, 77 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3789-drm-amd-pp-Clean-up-header-file-include.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3789-drm-amd-pp-Clean-up-header-file-include.patch
new file mode 100644
index 00000000..8e329eb2
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3789-drm-amd-pp-Clean-up-header-file-include.patch
@@ -0,0 +1,77 @@
+From 88d663f0d3accf05ada65d9688650e2e2a755690 Mon Sep 17 00:00:00 2001
+From: Rex Zhu <Rex.Zhu@amd.com>
+Date: Wed, 7 Mar 2018 16:40:21 +0800
+Subject: [PATCH 3789/4131] drm/amd/pp: Clean up header file include
+
+smu7_smumgr.h should not be included in rv and vega, The common functions
+for all smu7 asics are put in smu_smumgr.c.
+
+Not include cgs interface in smumgr.c. the code used cgs interface has been
+deleted.
+
+Not include smu_ucode_xfer_vi.h in rv/vega
+
+Change-Id: Idd788c767ca952348356d18aee3105c022b84190
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
+---
+ drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c     | 3 +--
+ drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c        | 1 -
+ drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 6 ++----
+ 3 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c
+index 2d68fae..ac3350a 100644
+--- a/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c
++++ b/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c
+@@ -31,8 +31,7 @@
+ #include "smu10.h"
+ #include "ppatomctrl.h"
+ #include "pp_debug.h"
+-#include "smu_ucode_xfer_vi.h"
+-#include "smu7_smumgr.h"
++
+ 
+ #define VOLTAGE_SCALE 4
+ 
+diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
+index 3645127..68d943d 100644
+--- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
++++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
+@@ -28,7 +28,6 @@
+ #include <linux/types.h>
+ #include <drm/amdgpu_drm.h>
+ #include "smumgr.h"
+-#include "cgs_common.h"
+ 
+ MODULE_FIRMWARE("amdgpu/topaz_smc.bin");
+ MODULE_FIRMWARE("amdgpu/topaz_k_smc.bin");
+diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
+index bc467ba..e08a611 100644
+--- a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
++++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
+@@ -27,11 +27,9 @@
+ #include "vega10_smumgr.h"
+ #include "vega10_ppsmc.h"
+ #include "smu9_driver_if.h"
+-
+ #include "ppatomctrl.h"
+ #include "pp_debug.h"
+-#include "smu_ucode_xfer_vi.h"
+-#include "smu7_smumgr.h"
++
+ 
+ #define AVFS_EN_MSB		1568
+ #define AVFS_EN_LSB		1568
+@@ -383,7 +381,7 @@ static int vega10_smu_init(struct pp_hwmgr *hwmgr)
+ 	struct cgs_firmware_info info = {0};
+ 
+ 	ret = cgs_get_firmware_info(hwmgr->device,
+-				    smu7_convert_fw_type_to_cgs(UCODE_ID_SMU),
++				    CGS_UCODE_ID_SMU,
+ 				    &info);
+ 	if (ret || !info.kptr)
+ 		return -EINVAL;
+-- 
+2.7.4
+