1 files changed, 83 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0687-drm-amd-powerplay-remove-duplicated-includes.patch b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0687-drm-amd-powerplay-remove-duplicated-includes.patch
new file mode 100644
index 00000000..68cf9f91
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0687-drm-amd-powerplay-remove-duplicated-includes.patch
@@ -0,0 +1,83 @@
+From ba20ac3332c3786ec0b94e6c89098fe3cce6ef0d Mon Sep 17 00:00:00 2001
+From: YueHaibing <yuehaibing@huawei.com>
+Date: Sun, 21 Oct 2018 18:39:58 +0800
+Subject: [PATCH 0687/2940] drm/amd/powerplay: remove duplicated includes
+
+Remove some duplicated include.
+
+Signed-off-by: YueHaibing <yuehaibing@huawei.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/powerplay/inc/hwmgr.h               | 1 -
+ drivers/gpu/drm/amd/powerplay/inc/smu7_common.h         | 4 ----
+ drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c | 1 -
+ drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c     | 1 -
+ drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c     | 1 -
+ 5 files changed, 8 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
+index e5a60aa44b5d..07d180ce4d18 100644
+--- a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
++++ b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
+@@ -28,7 +28,6 @@
+ #include "hardwaremanager.h"
+ #include "hwmgr_ppt.h"
+ #include "ppatomctrl.h"
+-#include "hwmgr_ppt.h"
+ #include "power_state.h"
+ #include "smu_helper.h"
+ 
+diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu7_common.h b/drivers/gpu/drm/amd/powerplay/inc/smu7_common.h
+index 65eb630bfea3..94bf7b649c20 100644
+--- a/drivers/gpu/drm/amd/powerplay/inc/smu7_common.h
++++ b/drivers/gpu/drm/amd/powerplay/inc/smu7_common.h
+@@ -37,10 +37,6 @@
+ #include "gmc/gmc_8_1_d.h"
+ #include "gmc/gmc_8_1_sh_mask.h"
+ 
+-#include "bif/bif_5_0_d.h"
+-#include "bif/bif_5_0_sh_mask.h"
+-
+-
+ #include "bif/bif_5_0_d.h"
+ #include "bif/bif_5_0_sh_mask.h"
+ 
+diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
+index 90c1215c6f5e..d2b97aabd45a 100644
+--- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
++++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
+@@ -44,7 +44,6 @@
+ 
+ #include "smu7_hwmgr.h"
+ #include "hardwaremanager.h"
+-#include "ppatomctrl.h"
+ #include "atombios.h"
+ #include "pppcielanes.h"
+ 
+diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c
+index d0eb8ab50148..d111dd4e03d7 100644
+--- a/drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c
++++ b/drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c
+@@ -29,7 +29,6 @@
+ #include "rv_ppsmc.h"
+ #include "smu10_driver_if.h"
+ #include "smu10.h"
+-#include "ppatomctrl.h"
+ #include "pp_debug.h"
+ 
+ 
+diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
+index 9f71512b2510..1e69300f6175 100644
+--- a/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
++++ b/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
+@@ -40,7 +40,6 @@
+ 
+ #include "smu7_hwmgr.h"
+ #include "hardwaremanager.h"
+-#include "ppatomctrl.h"
+ #include "atombios.h"
+ #include "pppcielanes.h"
+ 
+-- 
+2.17.1
+