AMD-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Feifei Xu <Feifei.Xu-5C7GfCeVMHo@public.gmane.org>
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Alexander.Deucher-5C7GfCeVMHo@public.gmane.org,
	Feifei Xu <Feifei.Xu-5C7GfCeVMHo@public.gmane.org>,
	michel-otUistvHUpPR7s880joybQ@public.gmane.org,
	christian.koenig-5C7GfCeVMHo@public.gmane.org
Subject: [Resend 1/3] drm/amd/include:cleanup vega10 sdma0/1 header files.
Date: Fri, 17 Nov 2017 18:27:52 +0800	[thread overview]
Message-ID: <1510914474-16409-1-git-send-email-Feifei.Xu@amd.com> (raw)

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

             reply	other threads:[~2017-11-17 10:27 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-17 10:27 Feifei Xu [this message]
     [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 header files 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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1510914474-16409-1-git-send-email-Feifei.Xu@amd.com \
    --to=feifei.xu-5c7gfcevmho@public.gmane.org \
    --cc=Alexander.Deucher-5C7GfCeVMHo@public.gmane.org \
    --cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    --cc=christian.koenig-5C7GfCeVMHo@public.gmane.org \
    --cc=michel-otUistvHUpPR7s880joybQ@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox