Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

drm/amd/include:cleanup vega10 nbio header files.

Cleanup asic_reg/vega10/NBIO folder.

Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Feifei Xu 7 years ago
parent
65417d9f55
commit
f0a58aa3f2
8 changed files with 10 additions and 10 deletions
Split View Show Diff Stats
  1. 2 2
      drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c
  2. 3 3
      drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
  3. 1 1
      drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
  4. 1 1
      drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
  5. 0 0
      drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_6_1_default.h
  6. 0 0
      drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_6_1_offset.h
  7. 0 0
      drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_6_1_sh_mask.h
  8. 3 3
      drivers/gpu/drm/amd/powerplay/hwmgr/vega10_inc.h

+ 2 - 2
drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c
View File 

@@ -23,8 +23,8 @@
 
 
 #include "amdgpu.h"
 
 #include "vega10/soc15ip.h"
 
-#include "vega10/NBIO/nbio_6_1_offset.h"
 
-#include "vega10/NBIO/nbio_6_1_sh_mask.h"
 
+#include "nbio/nbio_6_1_offset.h"
 
+#include "nbio/nbio_6_1_sh_mask.h"
 
 #include "gc/gc_9_0_offset.h"
 
 #include "gc/gc_9_0_sh_mask.h"
 
 #include "soc15.h"

+ 3 - 3
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
View File 

@@ -25,9 +25,9 @@
 
 #include "nbio_v6_1.h"
 
 
 #include "vega10/soc15ip.h"
 
-#include "vega10/NBIO/nbio_6_1_default.h"
 
-#include "vega10/NBIO/nbio_6_1_offset.h"
 
-#include "vega10/NBIO/nbio_6_1_sh_mask.h"
 
+#include "nbio/nbio_6_1_default.h"
 
+#include "nbio/nbio_6_1_offset.h"
 
+#include "nbio/nbio_6_1_sh_mask.h"
 
 #include "vega10/vega10_enum.h"
 
 
 #define smnCPM_CONTROL                                                                                  0x11180460

+ 1 - 1
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
View File 

@@ -36,7 +36,7 @@
 
 #include "mp/mp_9_0_sh_mask.h"
 
 #include "gc/gc_9_0_offset.h"
 
 #include "sdma0/sdma0_4_0_offset.h"
 
-#include "vega10/NBIO/nbio_6_1_offset.h"
 
+#include "nbio/nbio_6_1_offset.h"
 
 
 MODULE_FIRMWARE("amdgpu/vega10_sos.bin");
 
 MODULE_FIRMWARE("amdgpu/vega10_asd.bin");

+ 1 - 1
drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
View File 

@@ -57,7 +57,7 @@
 
 #include "dce/dce_12_0_offset.h"
 
 #include "dce/dce_12_0_sh_mask.h"
 
 #include "vega10/soc15ip.h"
 
-#include "vega10/NBIO/nbio_6_1_offset.h"
 
+#include "nbio/nbio_6_1_offset.h"
 
 #include "reg_helper.h"
 
 
 #include "dce100/dce100_resource.h"

+ 0 - 0
drivers/gpu/drm/amd/include/asic_reg/vega10/NBIO/nbio_6_1_default.h → drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_6_1_default.h
View File


+ 0 - 0
drivers/gpu/drm/amd/include/asic_reg/vega10/NBIO/nbio_6_1_offset.h → drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_6_1_offset.h
View File


+ 0 - 0
drivers/gpu/drm/amd/include/asic_reg/vega10/NBIO/nbio_6_1_sh_mask.h → drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_6_1_sh_mask.h
View File


+ 3 - 3
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_inc.h
View File 

@@ -35,9 +35,9 @@
 
 #include "asic_reg/gc/gc_9_0_offset.h"
 
 #include "asic_reg/gc/gc_9_0_sh_mask.h"
 
 
-#include "asic_reg/vega10/NBIO/nbio_6_1_default.h"
 
-#include "asic_reg/vega10/NBIO/nbio_6_1_offset.h"
 
-#include "asic_reg/vega10/NBIO/nbio_6_1_sh_mask.h"
 
+#include "asic_reg/nbio/nbio_6_1_default.h"
 
+#include "asic_reg/nbio/nbio_6_1_offset.h"
 
+#include "asic_reg/nbio/nbio_6_1_sh_mask.h"
 
 
 
 #endif