* [Resend 1/3] drm/amd/include:cleanup vega10 sdma0/1 header files.
@ 2017-11-17 10:27 Feifei Xu
[not found] ` <1510914474-16409-1-git-send-email-Feifei.Xu-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: Feifei Xu @ 2017-11-17 10:27 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alexander.Deucher-5C7GfCeVMHo, Feifei Xu,
michel-otUistvHUpPR7s880joybQ, christian.koenig-5C7GfCeVMHo
To remove include/asic_reg/vega10 folder,create IP folders sdma0/1.
This patch cleanup asic_reg/vega10/SDMA folders.
Change-Id: I861f4047cb23154f9094553b602157b01da9028e
Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 8 ++++----
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 2 +-
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 8 ++++----
drivers/gpu/drm/amd/amdgpu/soc15.c | 4 ++--
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 2 +-
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 2 +-
.../include/asic_reg/{vega10/SDMA0 => sdma0}/sdma0_4_0_default.h | 0
.../include/asic_reg/{vega10/SDMA0 => sdma0}/sdma0_4_0_offset.h | 0
.../include/asic_reg/{vega10/SDMA0 => sdma0}/sdma0_4_0_sh_mask.h | 0
.../include/asic_reg/{vega10/SDMA1 => sdma1}/sdma1_4_0_default.h | 0
.../include/asic_reg/{vega10/SDMA1 => sdma1}/sdma1_4_0_offset.h | 0
.../include/asic_reg/{vega10/SDMA1 => sdma1}/sdma1_4_0_sh_mask.h | 0
12 files changed, 13 insertions(+), 13 deletions(-)
rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SDMA0 => sdma0}/sdma0_4_0_default.h (100%)
rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SDMA0 => sdma0}/sdma0_4_0_offset.h (100%)
rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SDMA0 => sdma0}/sdma0_4_0_sh_mask.h (100%)
rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SDMA1 => sdma1}/sdma1_4_0_default.h (100%)
rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SDMA1 => sdma1}/sdma1_4_0_offset.h (100%)
rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SDMA1 => sdma1}/sdma1_4_0_sh_mask.h (100%)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
index d5b430d..0df691d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
@@ -35,10 +35,10 @@
#include "vega10/GC/gc_9_0_offset.h"
#include "vega10/GC/gc_9_0_sh_mask.h"
#include "vega10/vega10_enum.h"
-#include "vega10/SDMA0/sdma0_4_0_offset.h"
-#include "vega10/SDMA0/sdma0_4_0_sh_mask.h"
-#include "vega10/SDMA1/sdma1_4_0_offset.h"
-#include "vega10/SDMA1/sdma1_4_0_sh_mask.h"
+#include "sdma0/sdma0_4_0_offset.h"
+#include "sdma0/sdma0_4_0_sh_mask.h"
+#include "sdma1/sdma1_4_0_offset.h"
+#include "sdma1/sdma1_4_0_sh_mask.h"
#include "vega10/ATHUB/athub_1_0_offset.h"
#include "vega10/ATHUB/athub_1_0_sh_mask.h"
#include "vega10/OSSSYS/osssys_4_0_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 c7bcfe8..b855964 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
@@ -35,7 +35,7 @@
#include "vega10/MP/mp_9_0_offset.h"
#include "vega10/MP/mp_9_0_sh_mask.h"
#include "vega10/GC/gc_9_0_offset.h"
-#include "vega10/SDMA0/sdma0_4_0_offset.h"
+#include "sdma0/sdma0_4_0_offset.h"
#include "vega10/NBIO/nbio_6_1_offset.h"
MODULE_FIRMWARE("amdgpu/vega10_sos.bin");
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index fe78c00..3f68638 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -28,10 +28,10 @@
#include "amdgpu_trace.h"
#include "vega10/soc15ip.h"
-#include "vega10/SDMA0/sdma0_4_0_offset.h"
-#include "vega10/SDMA0/sdma0_4_0_sh_mask.h"
-#include "vega10/SDMA1/sdma1_4_0_offset.h"
-#include "vega10/SDMA1/sdma1_4_0_sh_mask.h"
+#include "sdma0/sdma0_4_0_offset.h"
+#include "sdma0/sdma0_4_0_sh_mask.h"
+#include "sdma1/sdma1_4_0_offset.h"
+#include "sdma1/sdma1_4_0_sh_mask.h"
#include "vega10/MMHUB/mmhub_1_0_offset.h"
#include "vega10/MMHUB/mmhub_1_0_sh_mask.h"
#include "vega10/HDP/hdp_4_0_offset.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 4e67fe1..367d579 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -38,8 +38,8 @@
#include "vega10/UVD/uvd_7_0_offset.h"
#include "vega10/GC/gc_9_0_offset.h"
#include "vega10/GC/gc_9_0_sh_mask.h"
-#include "vega10/SDMA0/sdma0_4_0_offset.h"
-#include "vega10/SDMA1/sdma1_4_0_offset.h"
+#include "sdma0/sdma0_4_0_offset.h"
+#include "sdma1/sdma1_4_0_offset.h"
#include "vega10/HDP/hdp_4_0_offset.h"
#include "vega10/HDP/hdp_4_0_sh_mask.h"
#include "vega10/MP/mp_9_0_offset.h"
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c
index cfc5d70..f7fe2a4 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c
@@ -25,7 +25,7 @@
#include "vega10/vega10_enum.h"
#include "vega10/GC/gc_9_0_offset.h"
#include "vega10/GC/gc_9_0_sh_mask.h"
-#include "vega10/SDMA0/sdma0_4_0_sh_mask.h"
+#include "sdma0/sdma0_4_0_sh_mask.h"
static int update_qpd_v9(struct device_queue_manager *dqm,
struct qcm_process_device *qpd);
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
index fa4bc43..953f252 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
@@ -29,7 +29,7 @@
#include "v9_structs.h"
#include "vega10/GC/gc_9_0_offset.h"
#include "vega10/GC/gc_9_0_sh_mask.h"
-#include "vega10/SDMA0/sdma0_4_0_sh_mask.h"
+#include "sdma0/sdma0_4_0_sh_mask.h"
static inline struct v9_mqd *get_mqd(void *mqd)
{
diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_default.h b/drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_default.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_default.h
rename to drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_default.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_offset.h b/drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_offset.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_offset.h
rename to drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_offset.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_sh_mask.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_sh_mask.h
rename to drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_sh_mask.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_default.h b/drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_default.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_default.h
rename to drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_default.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_offset.h b/drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_offset.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_offset.h
rename to drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_offset.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_sh_mask.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_sh_mask.h
rename to drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_sh_mask.h
--
2.7.4
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Resend 2/3] drm/amd/include:cleanup vega10 hdp header files.
[not found] ` <1510914474-16409-1-git-send-email-Feifei.Xu-5C7GfCeVMHo@public.gmane.org>
@ 2017-11-17 10:27 ` Feifei Xu
2017-11-17 10:27 ` [Resend 3/3] drm/amd/include:cleanup vega10 mp " Feifei Xu
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Feifei Xu @ 2017-11-17 10:27 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alexander.Deucher-5C7GfCeVMHo, Feifei Xu,
michel-otUistvHUpPR7s880joybQ, christian.koenig-5C7GfCeVMHo
To remove include/asic_reg/vega10 folder,create IP folder hdp.
This patch cleanup asic_reg/vega10/HDP folder, and remove
unused hdp_4_0_default.h file.
Change-Id: Ia7cd2e660ceb89a1096c195c6a67677714ccbd69
Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 +-
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/soc15.c | 4 +-
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +-
.../asic_reg/{vega10/HDP => hdp}/hdp_4_0_offset.h | 0
.../asic_reg/{vega10/HDP => hdp}/hdp_4_0_sh_mask.h | 0
.../include/asic_reg/vega10/HDP/hdp_4_0_default.h | 117 ---------------------
9 files changed, 8 insertions(+), 125 deletions(-)
rename drivers/gpu/drm/amd/include/asic_reg/{vega10/HDP => hdp}/hdp_4_0_offset.h (100%)
rename drivers/gpu/drm/amd/include/asic_reg/{vega10/HDP => hdp}/hdp_4_0_sh_mask.h (100%)
delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_default.h
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index ee565d0..1fe9032 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -32,7 +32,7 @@
#include "vega10/GC/gc_9_0_offset.h"
#include "vega10/GC/gc_9_0_sh_mask.h"
#include "vega10/vega10_enum.h"
-#include "vega10/HDP/hdp_4_0_offset.h"
+#include "hdp/hdp_4_0_offset.h"
#include "soc15_common.h"
#include "clearstate_gfx9.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 3a855e0..a5e8eab 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -26,8 +26,8 @@
#include "amdgpu_atomfirmware.h"
#include "vega10/soc15ip.h"
-#include "vega10/HDP/hdp_4_0_offset.h"
-#include "vega10/HDP/hdp_4_0_sh_mask.h"
+#include "hdp/hdp_4_0_offset.h"
+#include "hdp/hdp_4_0_sh_mask.h"
#include "vega10/GC/gc_9_0_sh_mask.h"
#include "vega10/DC/dce_12_0_offset.h"
#include "vega10/DC/dce_12_0_sh_mask.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index 3f68638..0e89d71 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -34,7 +34,7 @@
#include "sdma1/sdma1_4_0_sh_mask.h"
#include "vega10/MMHUB/mmhub_1_0_offset.h"
#include "vega10/MMHUB/mmhub_1_0_sh_mask.h"
-#include "vega10/HDP/hdp_4_0_offset.h"
+#include "hdp/hdp_4_0_offset.h"
#include "raven1/SDMA0/sdma0_4_1_default.h"
#include "soc15_common.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 367d579..b07d37b 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -40,8 +40,8 @@
#include "vega10/GC/gc_9_0_sh_mask.h"
#include "sdma0/sdma0_4_0_offset.h"
#include "sdma1/sdma1_4_0_offset.h"
-#include "vega10/HDP/hdp_4_0_offset.h"
-#include "vega10/HDP/hdp_4_0_sh_mask.h"
+#include "hdp/hdp_4_0_offset.h"
+#include "hdp/hdp_4_0_sh_mask.h"
#include "vega10/MP/mp_9_0_offset.h"
#include "vega10/MP/mp_9_0_sh_mask.h"
#include "vega10/SMUIO/smuio_9_0_offset.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
index 7b77339..7136936 100644
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
@@ -36,7 +36,7 @@
#include "vega10/VCE/vce_4_0_default.h"
#include "vega10/VCE/vce_4_0_sh_mask.h"
#include "vega10/NBIF/nbif_6_1_offset.h"
-#include "vega10/HDP/hdp_4_0_offset.h"
+#include "hdp/hdp_4_0_offset.h"
#include "vega10/MMHUB/mmhub_1_0_offset.h"
#include "vega10/MMHUB/mmhub_1_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 1eb4d79..6204267 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
@@ -31,7 +31,7 @@
#include "vega10/soc15ip.h"
#include "raven1/VCN/vcn_1_0_offset.h"
#include "raven1/VCN/vcn_1_0_sh_mask.h"
-#include "vega10/HDP/hdp_4_0_offset.h"
+#include "hdp/hdp_4_0_offset.h"
#include "raven1/MMHUB/mmhub_9_1_offset.h"
#include "raven1/MMHUB/mmhub_9_1_sh_mask.h"
diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_offset.h b/drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_0_offset.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_offset.h
rename to drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_0_offset.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_0_sh_mask.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_sh_mask.h
rename to drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_0_sh_mask.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_default.h b/drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_default.h
deleted file mode 100644
index 864690c..0000000
--
2.7.4
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Resend 3/3] drm/amd/include:cleanup vega10 mp header files.
[not found] ` <1510914474-16409-1-git-send-email-Feifei.Xu-5C7GfCeVMHo@public.gmane.org>
2017-11-17 10:27 ` [Resend 2/3] drm/amd/include:cleanup vega10 hdp " Feifei Xu
@ 2017-11-17 10:27 ` Feifei Xu
2017-11-17 10:34 ` [Resend 1/3] drm/amd/include:cleanup vega10 sdma0/1 " Christian König
2017-11-17 10:35 ` Feifei Xu
3 siblings, 0 replies; 5+ messages in thread
From: Feifei Xu @ 2017-11-17 10:27 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alexander.Deucher-5C7GfCeVMHo, Feifei Xu,
michel-otUistvHUpPR7s880joybQ, christian.koenig-5C7GfCeVMHo
To remove include/asic_reg/vega10 folder, this patch cleanup
asic_reg/vega10/MP folder, and remove unused mp_9_0_default.h.
Change-Id: Id53e6ab7a8bc78ff61457836b1b3ce499b158610
Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 4 +-
drivers/gpu/drm/amd/amdgpu/soc15.c | 4 +-
.../asic_reg/{vega10/MP => mp}/mp_9_0_offset.h | 0
.../asic_reg/{vega10/MP => mp}/mp_9_0_sh_mask.h | 0
.../include/asic_reg/vega10/MP/mp_9_0_default.h | 342 ---------------------
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_inc.h | 5 +-
6 files changed, 6 insertions(+), 349 deletions(-)
rename drivers/gpu/drm/amd/include/asic_reg/{vega10/MP => mp}/mp_9_0_offset.h (100%)
rename drivers/gpu/drm/amd/include/asic_reg/{vega10/MP => mp}/mp_9_0_sh_mask.h (100%)
delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_default.h
diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
index b855964..53df744 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
@@ -32,8 +32,8 @@
#include "psp_v3_1.h"
#include "vega10/soc15ip.h"
-#include "vega10/MP/mp_9_0_offset.h"
-#include "vega10/MP/mp_9_0_sh_mask.h"
+#include "mp/mp_9_0_offset.h"
+#include "mp/mp_9_0_sh_mask.h"
#include "vega10/GC/gc_9_0_offset.h"
#include "sdma0/sdma0_4_0_offset.h"
#include "vega10/NBIO/nbio_6_1_offset.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index b07d37b..1f54521 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -42,8 +42,8 @@
#include "sdma1/sdma1_4_0_offset.h"
#include "hdp/hdp_4_0_offset.h"
#include "hdp/hdp_4_0_sh_mask.h"
-#include "vega10/MP/mp_9_0_offset.h"
-#include "vega10/MP/mp_9_0_sh_mask.h"
+#include "mp/mp_9_0_offset.h"
+#include "mp/mp_9_0_sh_mask.h"
#include "vega10/SMUIO/smuio_9_0_offset.h"
#include "vega10/SMUIO/smuio_9_0_sh_mask.h"
diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_offset.h b/drivers/gpu/drm/amd/include/asic_reg/mp/mp_9_0_offset.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_offset.h
rename to drivers/gpu/drm/amd/include/asic_reg/mp/mp_9_0_offset.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/mp/mp_9_0_sh_mask.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_sh_mask.h
rename to drivers/gpu/drm/amd/include/asic_reg/mp/mp_9_0_sh_mask.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_default.h b/drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_default.h
deleted file mode 100644
index 98ba7d8..0000000
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_inc.h b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_inc.h
index 8c55eaa..2573f95 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_inc.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_inc.h
@@ -28,9 +28,8 @@
#include "asic_reg/vega10/THM/thm_9_0_offset.h"
#include "asic_reg/vega10/THM/thm_9_0_sh_mask.h"
-#include "asic_reg/vega10/MP/mp_9_0_default.h"
-#include "asic_reg/vega10/MP/mp_9_0_offset.h"
-#include "asic_reg/vega10/MP/mp_9_0_sh_mask.h"
+#include "asic_reg/mp/mp_9_0_offset.h"
+#include "asic_reg/mp/mp_9_0_sh_mask.h"
#include "asic_reg/vega10/GC/gc_9_0_default.h"
#include "asic_reg/vega10/GC/gc_9_0_offset.h"
--
2.7.4
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Resend 1/3] drm/amd/include:cleanup vega10 sdma0/1 header files.
[not found] ` <1510914474-16409-1-git-send-email-Feifei.Xu-5C7GfCeVMHo@public.gmane.org>
2017-11-17 10:27 ` [Resend 2/3] drm/amd/include:cleanup vega10 hdp " Feifei Xu
2017-11-17 10:27 ` [Resend 3/3] drm/amd/include:cleanup vega10 mp " Feifei Xu
@ 2017-11-17 10:34 ` Christian König
2017-11-17 10:35 ` Feifei Xu
3 siblings, 0 replies; 5+ messages in thread
From: Christian König @ 2017-11-17 10:34 UTC (permalink / raw)
To: Feifei Xu, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alexander.Deucher-5C7GfCeVMHo, michel-otUistvHUpPR7s880joybQ
Am 17.11.2017 um 11:27 schrieb Feifei Xu:
> To remove include/asic_reg/vega10 folder,create IP folders sdma0/1.
> This patch cleanup asic_reg/vega10/SDMA folders.
>
> Change-Id: I861f4047cb23154f9094553b602157b01da9028e
> Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
Not sure if we should distinct between sdma0/sdma1, but in general looks
like a good idea to me.
Series is Acked-by: Christian König <christian.koenig@amd.com>.
Regards,
Christian.
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 8 ++++----
> drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 8 ++++----
> drivers/gpu/drm/amd/amdgpu/soc15.c | 4 ++--
> drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 2 +-
> drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 2 +-
> .../include/asic_reg/{vega10/SDMA0 => sdma0}/sdma0_4_0_default.h | 0
> .../include/asic_reg/{vega10/SDMA0 => sdma0}/sdma0_4_0_offset.h | 0
> .../include/asic_reg/{vega10/SDMA0 => sdma0}/sdma0_4_0_sh_mask.h | 0
> .../include/asic_reg/{vega10/SDMA1 => sdma1}/sdma1_4_0_default.h | 0
> .../include/asic_reg/{vega10/SDMA1 => sdma1}/sdma1_4_0_offset.h | 0
> .../include/asic_reg/{vega10/SDMA1 => sdma1}/sdma1_4_0_sh_mask.h | 0
> 12 files changed, 13 insertions(+), 13 deletions(-)
> rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SDMA0 => sdma0}/sdma0_4_0_default.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SDMA0 => sdma0}/sdma0_4_0_offset.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SDMA0 => sdma0}/sdma0_4_0_sh_mask.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SDMA1 => sdma1}/sdma1_4_0_default.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SDMA1 => sdma1}/sdma1_4_0_offset.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SDMA1 => sdma1}/sdma1_4_0_sh_mask.h (100%)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> index d5b430d..0df691d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> @@ -35,10 +35,10 @@
> #include "vega10/GC/gc_9_0_offset.h"
> #include "vega10/GC/gc_9_0_sh_mask.h"
> #include "vega10/vega10_enum.h"
> -#include "vega10/SDMA0/sdma0_4_0_offset.h"
> -#include "vega10/SDMA0/sdma0_4_0_sh_mask.h"
> -#include "vega10/SDMA1/sdma1_4_0_offset.h"
> -#include "vega10/SDMA1/sdma1_4_0_sh_mask.h"
> +#include "sdma0/sdma0_4_0_offset.h"
> +#include "sdma0/sdma0_4_0_sh_mask.h"
> +#include "sdma1/sdma1_4_0_offset.h"
> +#include "sdma1/sdma1_4_0_sh_mask.h"
> #include "vega10/ATHUB/athub_1_0_offset.h"
> #include "vega10/ATHUB/athub_1_0_sh_mask.h"
> #include "vega10/OSSSYS/osssys_4_0_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 c7bcfe8..b855964 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> @@ -35,7 +35,7 @@
> #include "vega10/MP/mp_9_0_offset.h"
> #include "vega10/MP/mp_9_0_sh_mask.h"
> #include "vega10/GC/gc_9_0_offset.h"
> -#include "vega10/SDMA0/sdma0_4_0_offset.h"
> +#include "sdma0/sdma0_4_0_offset.h"
> #include "vega10/NBIO/nbio_6_1_offset.h"
>
> MODULE_FIRMWARE("amdgpu/vega10_sos.bin");
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> index fe78c00..3f68638 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> @@ -28,10 +28,10 @@
> #include "amdgpu_trace.h"
>
> #include "vega10/soc15ip.h"
> -#include "vega10/SDMA0/sdma0_4_0_offset.h"
> -#include "vega10/SDMA0/sdma0_4_0_sh_mask.h"
> -#include "vega10/SDMA1/sdma1_4_0_offset.h"
> -#include "vega10/SDMA1/sdma1_4_0_sh_mask.h"
> +#include "sdma0/sdma0_4_0_offset.h"
> +#include "sdma0/sdma0_4_0_sh_mask.h"
> +#include "sdma1/sdma1_4_0_offset.h"
> +#include "sdma1/sdma1_4_0_sh_mask.h"
> #include "vega10/MMHUB/mmhub_1_0_offset.h"
> #include "vega10/MMHUB/mmhub_1_0_sh_mask.h"
> #include "vega10/HDP/hdp_4_0_offset.h"
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index 4e67fe1..367d579 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -38,8 +38,8 @@
> #include "vega10/UVD/uvd_7_0_offset.h"
> #include "vega10/GC/gc_9_0_offset.h"
> #include "vega10/GC/gc_9_0_sh_mask.h"
> -#include "vega10/SDMA0/sdma0_4_0_offset.h"
> -#include "vega10/SDMA1/sdma1_4_0_offset.h"
> +#include "sdma0/sdma0_4_0_offset.h"
> +#include "sdma1/sdma1_4_0_offset.h"
> #include "vega10/HDP/hdp_4_0_offset.h"
> #include "vega10/HDP/hdp_4_0_sh_mask.h"
> #include "vega10/MP/mp_9_0_offset.h"
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c
> index cfc5d70..f7fe2a4 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c
> @@ -25,7 +25,7 @@
> #include "vega10/vega10_enum.h"
> #include "vega10/GC/gc_9_0_offset.h"
> #include "vega10/GC/gc_9_0_sh_mask.h"
> -#include "vega10/SDMA0/sdma0_4_0_sh_mask.h"
> +#include "sdma0/sdma0_4_0_sh_mask.h"
>
> static int update_qpd_v9(struct device_queue_manager *dqm,
> struct qcm_process_device *qpd);
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
> index fa4bc43..953f252 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
> @@ -29,7 +29,7 @@
> #include "v9_structs.h"
> #include "vega10/GC/gc_9_0_offset.h"
> #include "vega10/GC/gc_9_0_sh_mask.h"
> -#include "vega10/SDMA0/sdma0_4_0_sh_mask.h"
> +#include "sdma0/sdma0_4_0_sh_mask.h"
>
> static inline struct v9_mqd *get_mqd(void *mqd)
> {
> diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_default.h b/drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_default.h
> similarity index 100%
> rename from drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_default.h
> rename to drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_default.h
> diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_offset.h b/drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_offset.h
> similarity index 100%
> rename from drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_offset.h
> rename to drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_offset.h
> diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_sh_mask.h
> similarity index 100%
> rename from drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_sh_mask.h
> rename to drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_sh_mask.h
> diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_default.h b/drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_default.h
> similarity index 100%
> rename from drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_default.h
> rename to drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_default.h
> diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_offset.h b/drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_offset.h
> similarity index 100%
> rename from drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_offset.h
> rename to drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_offset.h
> diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_sh_mask.h
> similarity index 100%
> rename from drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_sh_mask.h
> rename to drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_sh_mask.h
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Resend 1/3] drm/amd/include:cleanup vega10 sdma0/1 header files.
[not found] ` <1510914474-16409-1-git-send-email-Feifei.Xu-5C7GfCeVMHo@public.gmane.org>
` (2 preceding siblings ...)
2017-11-17 10:34 ` [Resend 1/3] drm/amd/include:cleanup vega10 sdma0/1 " Christian König
@ 2017-11-17 10:35 ` Feifei Xu
3 siblings, 0 replies; 5+ messages in thread
From: Feifei Xu @ 2017-11-17 10:35 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Resend patch-set which cleanup vega10's sdma0/1,hdp,mp header files.
No source code change from previous thread.
Just omit the preimage for deletes and omit the renames to format a resonable size patch.
--
-Feifei
On 11/17/2017 06:27 PM, Feifei Xu wrote:
> To remove include/asic_reg/vega10 folder,create IP folders sdma0/1.
> This patch cleanup asic_reg/vega10/SDMA folders.
>
> Change-Id: I861f4047cb23154f9094553b602157b01da9028e
> Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 8 ++++----
> drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 8 ++++----
> drivers/gpu/drm/amd/amdgpu/soc15.c | 4 ++--
> drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 2 +-
> drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 2 +-
> .../include/asic_reg/{vega10/SDMA0 => sdma0}/sdma0_4_0_default.h | 0
> .../include/asic_reg/{vega10/SDMA0 => sdma0}/sdma0_4_0_offset.h | 0
> .../include/asic_reg/{vega10/SDMA0 => sdma0}/sdma0_4_0_sh_mask.h | 0
> .../include/asic_reg/{vega10/SDMA1 => sdma1}/sdma1_4_0_default.h | 0
> .../include/asic_reg/{vega10/SDMA1 => sdma1}/sdma1_4_0_offset.h | 0
> .../include/asic_reg/{vega10/SDMA1 => sdma1}/sdma1_4_0_sh_mask.h | 0
> 12 files changed, 13 insertions(+), 13 deletions(-)
> rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SDMA0 => sdma0}/sdma0_4_0_default.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SDMA0 => sdma0}/sdma0_4_0_offset.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SDMA0 => sdma0}/sdma0_4_0_sh_mask.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SDMA1 => sdma1}/sdma1_4_0_default.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SDMA1 => sdma1}/sdma1_4_0_offset.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SDMA1 => sdma1}/sdma1_4_0_sh_mask.h (100%)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> index d5b430d..0df691d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> @@ -35,10 +35,10 @@
> #include "vega10/GC/gc_9_0_offset.h"
> #include "vega10/GC/gc_9_0_sh_mask.h"
> #include "vega10/vega10_enum.h"
> -#include "vega10/SDMA0/sdma0_4_0_offset.h"
> -#include "vega10/SDMA0/sdma0_4_0_sh_mask.h"
> -#include "vega10/SDMA1/sdma1_4_0_offset.h"
> -#include "vega10/SDMA1/sdma1_4_0_sh_mask.h"
> +#include "sdma0/sdma0_4_0_offset.h"
> +#include "sdma0/sdma0_4_0_sh_mask.h"
> +#include "sdma1/sdma1_4_0_offset.h"
> +#include "sdma1/sdma1_4_0_sh_mask.h"
> #include "vega10/ATHUB/athub_1_0_offset.h"
> #include "vega10/ATHUB/athub_1_0_sh_mask.h"
> #include "vega10/OSSSYS/osssys_4_0_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 c7bcfe8..b855964 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> @@ -35,7 +35,7 @@
> #include "vega10/MP/mp_9_0_offset.h"
> #include "vega10/MP/mp_9_0_sh_mask.h"
> #include "vega10/GC/gc_9_0_offset.h"
> -#include "vega10/SDMA0/sdma0_4_0_offset.h"
> +#include "sdma0/sdma0_4_0_offset.h"
> #include "vega10/NBIO/nbio_6_1_offset.h"
>
> MODULE_FIRMWARE("amdgpu/vega10_sos.bin");
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> index fe78c00..3f68638 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> @@ -28,10 +28,10 @@
> #include "amdgpu_trace.h"
>
> #include "vega10/soc15ip.h"
> -#include "vega10/SDMA0/sdma0_4_0_offset.h"
> -#include "vega10/SDMA0/sdma0_4_0_sh_mask.h"
> -#include "vega10/SDMA1/sdma1_4_0_offset.h"
> -#include "vega10/SDMA1/sdma1_4_0_sh_mask.h"
> +#include "sdma0/sdma0_4_0_offset.h"
> +#include "sdma0/sdma0_4_0_sh_mask.h"
> +#include "sdma1/sdma1_4_0_offset.h"
> +#include "sdma1/sdma1_4_0_sh_mask.h"
> #include "vega10/MMHUB/mmhub_1_0_offset.h"
> #include "vega10/MMHUB/mmhub_1_0_sh_mask.h"
> #include "vega10/HDP/hdp_4_0_offset.h"
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index 4e67fe1..367d579 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -38,8 +38,8 @@
> #include "vega10/UVD/uvd_7_0_offset.h"
> #include "vega10/GC/gc_9_0_offset.h"
> #include "vega10/GC/gc_9_0_sh_mask.h"
> -#include "vega10/SDMA0/sdma0_4_0_offset.h"
> -#include "vega10/SDMA1/sdma1_4_0_offset.h"
> +#include "sdma0/sdma0_4_0_offset.h"
> +#include "sdma1/sdma1_4_0_offset.h"
> #include "vega10/HDP/hdp_4_0_offset.h"
> #include "vega10/HDP/hdp_4_0_sh_mask.h"
> #include "vega10/MP/mp_9_0_offset.h"
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c
> index cfc5d70..f7fe2a4 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c
> @@ -25,7 +25,7 @@
> #include "vega10/vega10_enum.h"
> #include "vega10/GC/gc_9_0_offset.h"
> #include "vega10/GC/gc_9_0_sh_mask.h"
> -#include "vega10/SDMA0/sdma0_4_0_sh_mask.h"
> +#include "sdma0/sdma0_4_0_sh_mask.h"
>
> static int update_qpd_v9(struct device_queue_manager *dqm,
> struct qcm_process_device *qpd);
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
> index fa4bc43..953f252 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
> @@ -29,7 +29,7 @@
> #include "v9_structs.h"
> #include "vega10/GC/gc_9_0_offset.h"
> #include "vega10/GC/gc_9_0_sh_mask.h"
> -#include "vega10/SDMA0/sdma0_4_0_sh_mask.h"
> +#include "sdma0/sdma0_4_0_sh_mask.h"
>
> static inline struct v9_mqd *get_mqd(void *mqd)
> {
> diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_default.h b/drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_default.h
> similarity index 100%
> rename from drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_default.h
> rename to drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_default.h
> diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_offset.h b/drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_offset.h
> similarity index 100%
> rename from drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_offset.h
> rename to drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_offset.h
> diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_sh_mask.h
> similarity index 100%
> rename from drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_sh_mask.h
> rename to drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_sh_mask.h
> diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_default.h b/drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_default.h
> similarity index 100%
> rename from drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_default.h
> rename to drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_default.h
> diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_offset.h b/drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_offset.h
> similarity index 100%
> rename from drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_offset.h
> rename to drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_offset.h
> diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_sh_mask.h
> similarity index 100%
> rename from drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_sh_mask.h
> rename to drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_sh_mask.h
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-11-17 10:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-17 10:27 [Resend 1/3] drm/amd/include:cleanup vega10 sdma0/1 header files Feifei Xu
[not found] ` <1510914474-16409-1-git-send-email-Feifei.Xu-5C7GfCeVMHo@public.gmane.org>
2017-11-17 10:27 ` [Resend 2/3] drm/amd/include:cleanup vega10 hdp " Feifei Xu
2017-11-17 10:27 ` [Resend 3/3] drm/amd/include:cleanup vega10 mp " Feifei Xu
2017-11-17 10:34 ` [Resend 1/3] drm/amd/include:cleanup vega10 sdma0/1 " Christian König
2017-11-17 10:35 ` Feifei Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox