diff options
author | Feifei Xu <Feifei.Xu@amd.com> | 2017-11-23 01:30:43 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-12-06 12:48:20 -0500 |
commit | 65417d9f553b5877a3fa4e32544e6a2bcb539ea9 (patch) | |
tree | 752125f3699dd3f866c9c04c8e923a345e312ffe /drivers/gpu/drm/amd/amdgpu | |
parent | cde5c34f63a6bbd082e3ce993919f23f1ac5fb68 (diff) |
drm/amd/include:cleanup vega10 mmhub header files.
Cleanup asic_reg/vega10/MMHUB folder.
Signed-off-by: Feifei Xu <Feifei.Xu@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/gmc_v9_0.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c index bee0ea11446e..a201efd41279 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include "dce/dce_12_0_offset.h" | 32 | #include "dce/dce_12_0_offset.h" |
33 | #include "dce/dce_12_0_sh_mask.h" | 33 | #include "dce/dce_12_0_sh_mask.h" |
34 | #include "vega10/vega10_enum.h" | 34 | #include "vega10/vega10_enum.h" |
35 | #include "vega10/MMHUB/mmhub_1_0_offset.h" | 35 | #include "mmhub/mmhub_1_0_offset.h" |
36 | #include "athub/athub_1_0_offset.h" | 36 | #include "athub/athub_1_0_offset.h" |
37 | 37 | ||
38 | #include "soc15_common.h" | 38 | #include "soc15_common.h" |
diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c index 04e9527f5bce..d2268575b098 100644 --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | |||
@@ -24,9 +24,9 @@ | |||
24 | #include "mmhub_v1_0.h" | 24 | #include "mmhub_v1_0.h" |
25 | 25 | ||
26 | #include "vega10/soc15ip.h" | 26 | #include "vega10/soc15ip.h" |
27 | #include "vega10/MMHUB/mmhub_1_0_offset.h" | 27 | #include "mmhub/mmhub_1_0_offset.h" |
28 | #include "vega10/MMHUB/mmhub_1_0_sh_mask.h" | 28 | #include "mmhub/mmhub_1_0_sh_mask.h" |
29 | #include "vega10/MMHUB/mmhub_1_0_default.h" | 29 | #include "mmhub/mmhub_1_0_default.h" |
30 | #include "athub/athub_1_0_offset.h" | 30 | #include "athub/athub_1_0_offset.h" |
31 | #include "athub/athub_1_0_sh_mask.h" | 31 | #include "athub/athub_1_0_sh_mask.h" |
32 | #include "vega10/vega10_enum.h" | 32 | #include "vega10/vega10_enum.h" |
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c index 6d14ea62d5c1..67b34914679f 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | |||
@@ -32,8 +32,8 @@ | |||
32 | #include "sdma0/sdma0_4_0_sh_mask.h" | 32 | #include "sdma0/sdma0_4_0_sh_mask.h" |
33 | #include "sdma1/sdma1_4_0_offset.h" | 33 | #include "sdma1/sdma1_4_0_offset.h" |
34 | #include "sdma1/sdma1_4_0_sh_mask.h" | 34 | #include "sdma1/sdma1_4_0_sh_mask.h" |
35 | #include "vega10/MMHUB/mmhub_1_0_offset.h" | 35 | #include "mmhub/mmhub_1_0_offset.h" |
36 | #include "vega10/MMHUB/mmhub_1_0_sh_mask.h" | 36 | #include "mmhub/mmhub_1_0_sh_mask.h" |
37 | #include "hdp/hdp_4_0_offset.h" | 37 | #include "hdp/hdp_4_0_offset.h" |
38 | #include "raven1/SDMA0/sdma0_4_1_default.h" | 38 | #include "raven1/SDMA0/sdma0_4_1_default.h" |
39 | 39 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c index c122e95efe7d..19beff3505fc 100644 --- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | |||
@@ -37,8 +37,8 @@ | |||
37 | #include "vce/vce_4_0_sh_mask.h" | 37 | #include "vce/vce_4_0_sh_mask.h" |
38 | #include "vega10/NBIF/nbif_6_1_offset.h" | 38 | #include "vega10/NBIF/nbif_6_1_offset.h" |
39 | #include "hdp/hdp_4_0_offset.h" | 39 | #include "hdp/hdp_4_0_offset.h" |
40 | #include "vega10/MMHUB/mmhub_1_0_offset.h" | 40 | #include "mmhub/mmhub_1_0_offset.h" |
41 | #include "vega10/MMHUB/mmhub_1_0_sh_mask.h" | 41 | #include "mmhub/mmhub_1_0_sh_mask.h" |
42 | 42 | ||
43 | static void uvd_v7_0_set_ring_funcs(struct amdgpu_device *adev); | 43 | static void uvd_v7_0_set_ring_funcs(struct amdgpu_device *adev); |
44 | static void uvd_v7_0_set_enc_ring_funcs(struct amdgpu_device *adev); | 44 | static void uvd_v7_0_set_enc_ring_funcs(struct amdgpu_device *adev); |
diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c index 1b28c91506eb..a6bb51b1322c 100644 --- a/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | |||
@@ -36,8 +36,8 @@ | |||
36 | #include "vce/vce_4_0_offset.h" | 36 | #include "vce/vce_4_0_offset.h" |
37 | #include "vce/vce_4_0_default.h" | 37 | #include "vce/vce_4_0_default.h" |
38 | #include "vce/vce_4_0_sh_mask.h" | 38 | #include "vce/vce_4_0_sh_mask.h" |
39 | #include "vega10/MMHUB/mmhub_1_0_offset.h" | 39 | #include "mmhub/mmhub_1_0_offset.h" |
40 | #include "vega10/MMHUB/mmhub_1_0_sh_mask.h" | 40 | #include "mmhub/mmhub_1_0_sh_mask.h" |
41 | 41 | ||
42 | #define VCE_STATUS_VCPU_REPORT_FW_LOADED_MASK 0x02 | 42 | #define VCE_STATUS_VCPU_REPORT_FW_LOADED_MASK 0x02 |
43 | 43 | ||