1 files changed, 210 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2844-drm-admgpu-Reduce-the-usage-of-soc15ip.h.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2844-drm-admgpu-Reduce-the-usage-of-soc15ip.h.patch
new file mode 100644
index 00000000..f2d330a0
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2844-drm-admgpu-Reduce-the-usage-of-soc15ip.h.patch
@@ -0,0 +1,210 @@
+From 3c63a3ab74e34756413b8775237d5cefa8866a02 Mon Sep 17 00:00:00 2001
+From: Shaoyun Liu <Shaoyun.Liu@amd.com>
+Date: Wed, 29 Nov 2017 14:04:58 -0500
+Subject: [PATCH 2844/4131] drm/admgpu: Reduce the usage of soc15ip.h
+
+Change-Id: I132079eb13264aeab62c9e40c1a351609f15f90e
+Acked-by: Christian Konig <christian.koenig@amd.com>
+Signed-off-by: Shaoyun Liu <Shaoyun.Liu@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c  | 1 -
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c    | 1 -
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c    | 1 -
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c  | 1 -
+ drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c    | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c   | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c   | 1 -
+ drivers/gpu/drm/amd/amdgpu/psp_v3_1.c    | 1 -
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c   | 1 -
+ drivers/gpu/drm/amd/amdgpu/soc15.c       | 1 -
+ drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c    | 1 -
+ drivers/gpu/drm/amd/amdgpu/vce_v4_0.c    | 1 -
+ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c    | 1 -
+ drivers/gpu/drm/amd/amdgpu/vega10_ih.c   | 2 --
+ 15 files changed, 16 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+index bdbdfd9..8b3e06b 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+@@ -35,7 +35,6 @@
+ #include "soc15d.h"
+ #include "soc15_common.h"
+ 
+-#include "soc15ip.h"
+ #include "vcn/vcn_1_0_offset.h"
+ 
+ /* 1 second timeout */
+diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+index efe6d12..466c823 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+@@ -28,7 +28,6 @@
+ #include "soc15.h"
+ #include "soc15d.h"
+ 
+-#include "soc15ip.h"
+ #include "gc/gc_9_0_offset.h"
+ #include "gc/gc_9_0_sh_mask.h"
+ #include "vega10_enum.h"
+diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
+index f1effad..1d392f1 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
+@@ -23,7 +23,6 @@
+ #include "amdgpu.h"
+ #include "gfxhub_v1_0.h"
+ 
+-#include "soc15ip.h"
+ #include "gc/gc_9_0_offset.h"
+ #include "gc/gc_9_0_sh_mask.h"
+ #include "gc/gc_9_0_default.h"
+diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+index b62bebd..7412523 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+@@ -25,7 +25,6 @@
+ #include "gmc_v9_0.h"
+ #include "amdgpu_atomfirmware.h"
+ 
+-#include "soc15ip.h"
+ #include "hdp/hdp_4_0_offset.h"
+ #include "hdp/hdp_4_0_sh_mask.h"
+ #include "gc/gc_9_0_sh_mask.h"
+diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
+index bd160d8..0c5a76f 100644
+--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
+@@ -23,7 +23,6 @@
+ #include "amdgpu.h"
+ #include "mmhub_v1_0.h"
+ 
+-#include "soc15ip.h"
+ #include "mmhub/mmhub_1_0_offset.h"
+ #include "mmhub/mmhub_1_0_sh_mask.h"
+ #include "mmhub/mmhub_1_0_default.h"
+diff --git a/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c b/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c
+index ad9054e..71f5690 100644
+--- a/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c
++++ b/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c
+@@ -22,7 +22,6 @@
+  */
+ 
+ #include "amdgpu.h"
+-#include "soc15ip.h"
+ #include "nbio/nbio_6_1_offset.h"
+ #include "nbio/nbio_6_1_sh_mask.h"
+ #include "gc/gc_9_0_offset.h"
+diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c b/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
+index 0d3272e..9a3546f 100644
+--- a/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
++++ b/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
+@@ -24,7 +24,6 @@
+ #include "amdgpu_atombios.h"
+ #include "nbio_v6_1.h"
+ 
+-#include "soc15ip.h"
+ #include "nbio/nbio_6_1_default.h"
+ #include "nbio/nbio_6_1_offset.h"
+ #include "nbio/nbio_6_1_sh_mask.h"
+diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c
+index 4220648..ce869f3 100644
+--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c
+@@ -24,7 +24,6 @@
+ #include "amdgpu_atombios.h"
+ #include "nbio_v7_0.h"
+ 
+-#include "soc15ip.h"
+ #include "nbio/nbio_7_0_default.h"
+ #include "nbio/nbio_7_0_offset.h"
+ #include "nbio/nbio_7_0_sh_mask.h"
+diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
+index 0b22e58..19bd193 100644
+--- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
++++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
+@@ -31,7 +31,6 @@
+ #include "soc15_common.h"
+ #include "psp_v3_1.h"
+ 
+-#include "soc15ip.h"
+ #include "mp/mp_9_0_offset.h"
+ #include "mp/mp_9_0_sh_mask.h"
+ #include "gc/gc_9_0_offset.h"
+diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+index a73e567..13050f4 100644
+--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+@@ -27,7 +27,6 @@
+ #include "amdgpu_ucode.h"
+ #include "amdgpu_trace.h"
+ 
+-#include "soc15ip.h"
+ #include "sdma0/sdma0_4_0_offset.h"
+ #include "sdma0/sdma0_4_0_sh_mask.h"
+ #include "sdma1/sdma1_4_0_offset.h"
+diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
+index e13a5c6..8cb7186 100644
+--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
++++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
+@@ -34,7 +34,6 @@
+ #include "atom.h"
+ #include "amd_pcie.h"
+ 
+-#include "soc15ip.h"
+ #include "uvd/uvd_7_0_offset.h"
+ #include "gc/gc_9_0_offset.h"
+ #include "gc/gc_9_0_sh_mask.h"
+diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
+index b22adeb..23b4462 100644
+--- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
+@@ -29,7 +29,6 @@
+ #include "soc15_common.h"
+ #include "mmsch_v1_0.h"
+ 
+-#include "soc15ip.h"
+ #include "uvd/uvd_7_0_offset.h"
+ #include "uvd/uvd_7_0_sh_mask.h"
+ #include "vce/vce_4_0_offset.h"
+diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
+index f2f7136..55f0186 100755
+--- a/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
+@@ -32,7 +32,6 @@
+ #include "soc15_common.h"
+ #include "mmsch_v1_0.h"
+ 
+-#include "soc15ip.h"
+ #include "vce/vce_4_0_offset.h"
+ #include "vce/vce_4_0_default.h"
+ #include "vce/vce_4_0_sh_mask.h"
+diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+index 29e3f78..a02dbf5 100644
+--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+@@ -28,7 +28,6 @@
+ #include "soc15d.h"
+ #include "soc15_common.h"
+ 
+-#include "soc15ip.h"
+ #include "vcn/vcn_1_0_offset.h"
+ #include "vcn/vcn_1_0_sh_mask.h"
+ #include "hdp/hdp_4_0_offset.h"
+diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
+index ca778cd..a1d8bbb 100644
+--- a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
++++ b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
+@@ -25,8 +25,6 @@
+ #include "amdgpu_ih.h"
+ #include "soc15.h"
+ 
+-
+-#include "soc15ip.h"
+ #include "oss/osssys_4_0_offset.h"
+ #include "oss/osssys_4_0_sh_mask.h"
+ 
+-- 
+2.7.4
+