aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu
diff options
context:
space:
mode:
authorShaoyun Liu <Shaoyun.Liu@amd.com>2017-11-29 14:04:58 -0500
committerAlex Deucher <alexander.deucher@amd.com>2017-12-08 11:35:19 -0500
commit4fd09a19a6337b1a58d6de8777e2210cec55ae84 (patch)
tree9cdfe965da4673be00e1627eb60cd08b2ac8e1fb /drivers/gpu/drm/amd/amdgpu
parentcd29253f650a6ab27bae8c0b8c17fb8e71f864e8 (diff)
drm/admgpu: Reduce the usage of soc15ip.h
Remove the header where it's not used. Acked-by: Christian Konig <christian.koenig@amd.com> Signed-off-by: Shaoyun Liu <Shaoyun.Liu@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/psp_v10_0.c1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/psp_v3_1.c1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/soc15.c1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c1
-rwxr-xr-xdrivers/gpu/drm/amd/amdgpu/vce_v4_0.c1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/vega10_ih.c2
16 files changed, 0 insertions, 17 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index 88e204d537f5..837962118dbc 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -35,7 +35,6 @@
35#include "soc15d.h" 35#include "soc15d.h"
36#include "soc15_common.h" 36#include "soc15_common.h"
37 37
38#include "soc15ip.h"
39#include "vcn/vcn_1_0_offset.h" 38#include "vcn/vcn_1_0_offset.h"
40 39
41/* 1 second timeout */ 40/* 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 ec53c23d0f6b..50a1edb7c32e 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 @@
28#include "soc15.h" 28#include "soc15.h"
29#include "soc15d.h" 29#include "soc15d.h"
30 30
31#include "soc15ip.h"
32#include "gc/gc_9_0_offset.h" 31#include "gc/gc_9_0_offset.h"
33#include "gc/gc_9_0_sh_mask.h" 32#include "gc/gc_9_0_sh_mask.h"
34#include "vega10_enum.h" 33#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 f1effadfbaa6..1d392f186e0d 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 @@
23#include "amdgpu.h" 23#include "amdgpu.h"
24#include "gfxhub_v1_0.h" 24#include "gfxhub_v1_0.h"
25 25
26#include "soc15ip.h"
27#include "gc/gc_9_0_offset.h" 26#include "gc/gc_9_0_offset.h"
28#include "gc/gc_9_0_sh_mask.h" 27#include "gc/gc_9_0_sh_mask.h"
29#include "gc/gc_9_0_default.h" 28#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 8e6776f2986e..aef5f70547ac 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 @@
25#include "gmc_v9_0.h" 25#include "gmc_v9_0.h"
26#include "amdgpu_atomfirmware.h" 26#include "amdgpu_atomfirmware.h"
27 27
28#include "soc15ip.h"
29#include "hdp/hdp_4_0_offset.h" 28#include "hdp/hdp_4_0_offset.h"
30#include "hdp/hdp_4_0_sh_mask.h" 29#include "hdp/hdp_4_0_sh_mask.h"
31#include "gc/gc_9_0_sh_mask.h" 30#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 bd160d8700e0..0c5a76f88d35 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 @@
23#include "amdgpu.h" 23#include "amdgpu.h"
24#include "mmhub_v1_0.h" 24#include "mmhub_v1_0.h"
25 25
26#include "soc15ip.h"
27#include "mmhub/mmhub_1_0_offset.h" 26#include "mmhub/mmhub_1_0_offset.h"
28#include "mmhub/mmhub_1_0_sh_mask.h" 27#include "mmhub/mmhub_1_0_sh_mask.h"
29#include "mmhub/mmhub_1_0_default.h" 28#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 ad9054e3903c..71f56900d6fe 100644
--- a/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c
+++ b/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c
@@ -22,7 +22,6 @@
22 */ 22 */
23 23
24#include "amdgpu.h" 24#include "amdgpu.h"
25#include "soc15ip.h"
26#include "nbio/nbio_6_1_offset.h" 25#include "nbio/nbio_6_1_offset.h"
27#include "nbio/nbio_6_1_sh_mask.h" 26#include "nbio/nbio_6_1_sh_mask.h"
28#include "gc/gc_9_0_offset.h" 27#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 0d3272ef7e57..9a3546f8b42b 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 @@
24#include "amdgpu_atombios.h" 24#include "amdgpu_atombios.h"
25#include "nbio_v6_1.h" 25#include "nbio_v6_1.h"
26 26
27#include "soc15ip.h"
28#include "nbio/nbio_6_1_default.h" 27#include "nbio/nbio_6_1_default.h"
29#include "nbio/nbio_6_1_offset.h" 28#include "nbio/nbio_6_1_offset.h"
30#include "nbio/nbio_6_1_sh_mask.h" 29#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 4220648c31ca..ce869f37a382 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 @@
24#include "amdgpu_atombios.h" 24#include "amdgpu_atombios.h"
25#include "nbio_v7_0.h" 25#include "nbio_v7_0.h"
26 26
27#include "soc15ip.h"
28#include "nbio/nbio_7_0_default.h" 27#include "nbio/nbio_7_0_default.h"
29#include "nbio/nbio_7_0_offset.h" 28#include "nbio/nbio_7_0_offset.h"
30#include "nbio/nbio_7_0_sh_mask.h" 29#include "nbio/nbio_7_0_sh_mask.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
index acaf7891eeab..5a9fe24697f9 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
@@ -30,7 +30,6 @@
30#include "soc15_common.h" 30#include "soc15_common.h"
31#include "psp_v10_0.h" 31#include "psp_v10_0.h"
32 32
33#include "soc15ip.h"
34#include "mp/mp_10_0_offset.h" 33#include "mp/mp_10_0_offset.h"
35#include "gc/gc_9_1_offset.h" 34#include "gc/gc_9_1_offset.h"
36#include "sdma0/sdma0_4_1_offset.h" 35#include "sdma0/sdma0_4_1_offset.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
index 0b22e58733db..19bd1934e63d 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 @@
31#include "soc15_common.h" 31#include "soc15_common.h"
32#include "psp_v3_1.h" 32#include "psp_v3_1.h"
33 33
34#include "soc15ip.h"
35#include "mp/mp_9_0_offset.h" 34#include "mp/mp_9_0_offset.h"
36#include "mp/mp_9_0_sh_mask.h" 35#include "mp/mp_9_0_sh_mask.h"
37#include "gc/gc_9_0_offset.h" 36#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 d3b1e5069e65..1fb51946a718 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 @@
27#include "amdgpu_ucode.h" 27#include "amdgpu_ucode.h"
28#include "amdgpu_trace.h" 28#include "amdgpu_trace.h"
29 29
30#include "soc15ip.h"
31#include "sdma0/sdma0_4_0_offset.h" 30#include "sdma0/sdma0_4_0_offset.h"
32#include "sdma0/sdma0_4_0_sh_mask.h" 31#include "sdma0/sdma0_4_0_sh_mask.h"
33#include "sdma1/sdma1_4_0_offset.h" 32#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 47fafe8540cb..2752d8d3e5ae 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -34,7 +34,6 @@
34#include "atom.h" 34#include "atom.h"
35#include "amd_pcie.h" 35#include "amd_pcie.h"
36 36
37#include "soc15ip.h"
38#include "uvd/uvd_7_0_offset.h" 37#include "uvd/uvd_7_0_offset.h"
39#include "gc/gc_9_0_offset.h" 38#include "gc/gc_9_0_offset.h"
40#include "gc/gc_9_0_sh_mask.h" 39#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 b22adeb39653..23b446236c80 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 @@
29#include "soc15_common.h" 29#include "soc15_common.h"
30#include "mmsch_v1_0.h" 30#include "mmsch_v1_0.h"
31 31
32#include "soc15ip.h"
33#include "uvd/uvd_7_0_offset.h" 32#include "uvd/uvd_7_0_offset.h"
34#include "uvd/uvd_7_0_sh_mask.h" 33#include "uvd/uvd_7_0_sh_mask.h"
35#include "vce/vce_4_0_offset.h" 34#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 f2f713650074..55f01868a9b6 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 @@
32#include "soc15_common.h" 32#include "soc15_common.h"
33#include "mmsch_v1_0.h" 33#include "mmsch_v1_0.h"
34 34
35#include "soc15ip.h"
36#include "vce/vce_4_0_offset.h" 35#include "vce/vce_4_0_offset.h"
37#include "vce/vce_4_0_default.h" 36#include "vce/vce_4_0_default.h"
38#include "vce/vce_4_0_sh_mask.h" 37#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 3f1ca8696704..aa0787de51a3 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 @@
28#include "soc15d.h" 28#include "soc15d.h"
29#include "soc15_common.h" 29#include "soc15_common.h"
30 30
31#include "soc15ip.h"
32#include "vcn/vcn_1_0_offset.h" 31#include "vcn/vcn_1_0_offset.h"
33#include "vcn/vcn_1_0_sh_mask.h" 32#include "vcn/vcn_1_0_sh_mask.h"
34#include "hdp/hdp_4_0_offset.h" 33#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 ca778cd4e6e8..a1d8bbbb269c 100644
--- a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
@@ -25,8 +25,6 @@
25#include "amdgpu_ih.h" 25#include "amdgpu_ih.h"
26#include "soc15.h" 26#include "soc15.h"
27 27
28
29#include "soc15ip.h"
30#include "oss/osssys_4_0_offset.h" 28#include "oss/osssys_4_0_offset.h"
31#include "oss/osssys_4_0_sh_mask.h" 29#include "oss/osssys_4_0_sh_mask.h"
32 30