Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Feifei Xu and committed by
Alex Deucher
65417d9f cde5c34f

+10 -10
+1 -1
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
··· 32 32 #include "dce/dce_12_0_offset.h" 33 33 #include "dce/dce_12_0_sh_mask.h" 34 34 #include "vega10/vega10_enum.h" 35 - #include "vega10/MMHUB/mmhub_1_0_offset.h" 35 + #include "mmhub/mmhub_1_0_offset.h" 36 36 #include "athub/athub_1_0_offset.h" 37 37 38 38 #include "soc15_common.h"
+3 -3
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
··· 24 24 #include "mmhub_v1_0.h" 25 25 26 26 #include "vega10/soc15ip.h" 27 - #include "vega10/MMHUB/mmhub_1_0_offset.h" 28 - #include "vega10/MMHUB/mmhub_1_0_sh_mask.h" 29 - #include "vega10/MMHUB/mmhub_1_0_default.h" 27 + #include "mmhub/mmhub_1_0_offset.h" 28 + #include "mmhub/mmhub_1_0_sh_mask.h" 29 + #include "mmhub/mmhub_1_0_default.h" 30 30 #include "athub/athub_1_0_offset.h" 31 31 #include "athub/athub_1_0_sh_mask.h" 32 32 #include "vega10/vega10_enum.h"
+2 -2
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
··· 32 32 #include "sdma0/sdma0_4_0_sh_mask.h" 33 33 #include "sdma1/sdma1_4_0_offset.h" 34 34 #include "sdma1/sdma1_4_0_sh_mask.h" 35 - #include "vega10/MMHUB/mmhub_1_0_offset.h" 36 - #include "vega10/MMHUB/mmhub_1_0_sh_mask.h" 35 + #include "mmhub/mmhub_1_0_offset.h" 36 + #include "mmhub/mmhub_1_0_sh_mask.h" 37 37 #include "hdp/hdp_4_0_offset.h" 38 38 #include "raven1/SDMA0/sdma0_4_1_default.h" 39 39
+2 -2
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
··· 37 37 #include "vce/vce_4_0_sh_mask.h" 38 38 #include "vega10/NBIF/nbif_6_1_offset.h" 39 39 #include "hdp/hdp_4_0_offset.h" 40 - #include "vega10/MMHUB/mmhub_1_0_offset.h" 41 - #include "vega10/MMHUB/mmhub_1_0_sh_mask.h" 40 + #include "mmhub/mmhub_1_0_offset.h" 41 + #include "mmhub/mmhub_1_0_sh_mask.h" 42 42 43 43 static void uvd_v7_0_set_ring_funcs(struct amdgpu_device *adev); 44 44 static void uvd_v7_0_set_enc_ring_funcs(struct amdgpu_device *adev);
+2 -2
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
··· 36 36 #include "vce/vce_4_0_offset.h" 37 37 #include "vce/vce_4_0_default.h" 38 38 #include "vce/vce_4_0_sh_mask.h" 39 - #include "vega10/MMHUB/mmhub_1_0_offset.h" 40 - #include "vega10/MMHUB/mmhub_1_0_sh_mask.h" 39 + #include "mmhub/mmhub_1_0_offset.h" 40 + #include "mmhub/mmhub_1_0_sh_mask.h" 41 41 42 42 #define VCE_STATUS_VCPU_REPORT_FW_LOADED_MASK 0x02 43 43
drivers/gpu/drm/amd/include/asic_reg/vega10/MMHUB/mmhub_1_0_default.h drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_1_0_default.h
drivers/gpu/drm/amd/include/asic_reg/vega10/MMHUB/mmhub_1_0_offset.h drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_1_0_offset.h
drivers/gpu/drm/amd/include/asic_reg/vega10/MMHUB/mmhub_1_0_sh_mask.h drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_1_0_sh_mask.h