* [PATCH 1/8] drm/amd/include:cleanup raven1 sdma header files.
[not found] ` <1511782150-31595-1-git-send-email-Feifei.Xu-5C7GfCeVMHo@public.gmane.org>
@ 2017-11-27 11:29 ` Feifei Xu
2017-11-27 11:29 ` [PATCH 2/8] drm/amd/include:cleanup raven1 dcn " Feifei Xu
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Feifei Xu @ 2017-11-27 11:29 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alexander.Deucher-5C7GfCeVMHo, Feifei Xu, Ken.Wang-5C7GfCeVMHo,
christian.koenig-5C7GfCeVMHo
Cleanup asic_reg/raven1/SDMA0 folder.Remove unused sdma0_4_1_sh_mask.h.
Change-Id: I3087f4b097e0971d221bcea96978b3fce942c49c
Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 +-
.../asic_reg/raven1/SDMA0/sdma0_4_1_sh_mask.h | 1658 --------------------
.../{raven1/SDMA0 => sdma0}/sdma0_4_1_default.h | 0
.../{raven1/SDMA0 => sdma0}/sdma0_4_1_offset.h | 0
5 files changed, 2 insertions(+), 1660 deletions(-)
delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/SDMA0/sdma0_4_1_sh_mask.h
rename drivers/gpu/drm/amd/include/asic_reg/{raven1/SDMA0 => sdma0}/sdma0_4_1_default.h (100%)
rename drivers/gpu/drm/amd/include/asic_reg/{raven1/SDMA0 => sdma0}/sdma0_4_1_offset.h (100%)
diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
index 062cd8a..a7ec158 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
@@ -33,7 +33,7 @@
#include "soc15ip.h"
#include "raven1/MP/mp_10_0_offset.h"
#include "raven1/GC/gc_9_1_offset.h"
-#include "raven1/SDMA0/sdma0_4_1_offset.h"
+#include "sdma0/sdma0_4_1_offset.h"
MODULE_FIRMWARE("amdgpu/raven_asd.bin");
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index a487fa7..4c55f21 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -35,7 +35,7 @@
#include "mmhub/mmhub_1_0_offset.h"
#include "mmhub/mmhub_1_0_sh_mask.h"
#include "hdp/hdp_4_0_offset.h"
-#include "raven1/SDMA0/sdma0_4_1_default.h"
+#include "sdma0/sdma0_4_1_default.h"
#include "soc15_common.h"
#include "soc15.h"
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/SDMA0/sdma0_4_1_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/raven1/SDMA0/sdma0_4_1_sh_mask.h
deleted file mode 100644
index 1445bba..0000000
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/SDMA0/sdma0_4_1_default.h b/drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_1_default.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/raven1/SDMA0/sdma0_4_1_default.h
rename to drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_1_default.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/SDMA0/sdma0_4_1_offset.h b/drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_1_offset.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/raven1/SDMA0/sdma0_4_1_offset.h
rename to drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_1_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] 11+ messages in thread* [PATCH 2/8] drm/amd/include:cleanup raven1 dcn header files.
[not found] ` <1511782150-31595-1-git-send-email-Feifei.Xu-5C7GfCeVMHo@public.gmane.org>
2017-11-27 11:29 ` [PATCH 1/8] drm/amd/include:cleanup raven1 sdma " Feifei Xu
@ 2017-11-27 11:29 ` Feifei Xu
2017-11-27 11:29 ` [PATCH 3/8] drm/amd/include:cleanup raven1 gc " Feifei Xu
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Feifei Xu @ 2017-11-27 11:29 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alexander.Deucher-5C7GfCeVMHo, Feifei Xu, Ken.Wang-5C7GfCeVMHo,
christian.koenig-5C7GfCeVMHo
Cleanup asic_reg/raven1/DCN folder.Remove unused
dcn_1_0_default.h.
Change-Id: I6a427f5379a501783deac0cc3e73f7739c215acb
Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +-
.../amd/display/dc/gpio/dcn10/hw_factory_dcn10.c | 4 +-
.../amd/display/dc/gpio/dcn10/hw_translate_dcn10.c | 4 +-
.../drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.c | 4 +-
.../amd/display/dc/irq/dcn10/irq_service_dcn10.c | 4 +-
.../asic_reg/{raven1/DCN => dcn}/dcn_1_0_offset.h | 0
.../asic_reg/{raven1/DCN => dcn}/dcn_1_0_sh_mask.h | 0
.../include/asic_reg/raven1/DCN/dcn_1_0_default.h | 7988 --------------------
9 files changed, 12 insertions(+), 8000 deletions(-)
rename drivers/gpu/drm/amd/include/asic_reg/{raven1/DCN => dcn}/dcn_1_0_offset.h (100%)
rename drivers/gpu/drm/amd/include/asic_reg/{raven1/DCN => dcn}/dcn_1_0_sh_mask.h (100%)
delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/DCN/dcn_1_0_default.h
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index fee7617..6f83112 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -59,8 +59,8 @@
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
#include "ivsrcid/irqsrcs_dcn_1_0.h"
-#include "raven1/DCN/dcn_1_0_offset.h"
-#include "raven1/DCN/dcn_1_0_sh_mask.h"
+#include "dcn/dcn_1_0_offset.h"
+#include "dcn/dcn_1_0_sh_mask.h"
#include "soc15ip.h"
#include "soc15_common.h"
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
index 6bc13c5..7a12a23 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
@@ -52,8 +52,8 @@
#include "soc15ip.h"
-#include "raven1/DCN/dcn_1_0_offset.h"
-#include "raven1/DCN/dcn_1_0_sh_mask.h"
+#include "dcn/dcn_1_0_offset.h"
+#include "dcn/dcn_1_0_sh_mask.h"
#include "raven1/NBIO/nbio_7_0_offset.h"
diff --git a/drivers/gpu/drm/amd/display/dc/gpio/dcn10/hw_factory_dcn10.c b/drivers/gpu/drm/amd/display/dc/gpio/dcn10/hw_factory_dcn10.c
index f937b35..5235f69 100644
--- a/drivers/gpu/drm/amd/display/dc/gpio/dcn10/hw_factory_dcn10.c
+++ b/drivers/gpu/drm/amd/display/dc/gpio/dcn10/hw_factory_dcn10.c
@@ -34,8 +34,8 @@
#include "hw_factory_dcn10.h"
-#include "raven1/DCN/dcn_1_0_offset.h"
-#include "raven1/DCN/dcn_1_0_sh_mask.h"
+#include "dcn/dcn_1_0_offset.h"
+#include "dcn/dcn_1_0_sh_mask.h"
#include "soc15ip.h"
#define block HPD
diff --git a/drivers/gpu/drm/amd/display/dc/gpio/dcn10/hw_translate_dcn10.c b/drivers/gpu/drm/amd/display/dc/gpio/dcn10/hw_translate_dcn10.c
index 75bfe6a..3478648 100644
--- a/drivers/gpu/drm/amd/display/dc/gpio/dcn10/hw_translate_dcn10.c
+++ b/drivers/gpu/drm/amd/display/dc/gpio/dcn10/hw_translate_dcn10.c
@@ -33,8 +33,8 @@
#include "include/gpio_types.h"
#include "../hw_translate.h"
-#include "raven1/DCN/dcn_1_0_offset.h"
-#include "raven1/DCN/dcn_1_0_sh_mask.h"
+#include "dcn/dcn_1_0_offset.h"
+#include "dcn/dcn_1_0_sh_mask.h"
#include "soc15ip.h"
/* begin *********************
diff --git a/drivers/gpu/drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.c b/drivers/gpu/drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.c
index b523732..bed7cc3 100644
--- a/drivers/gpu/drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.c
+++ b/drivers/gpu/drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.c
@@ -36,8 +36,8 @@
#include "../dce110/i2c_hw_engine_dce110.h"
#include "../dce110/i2caux_dce110.h"
-#include "raven1/DCN/dcn_1_0_offset.h"
-#include "raven1/DCN/dcn_1_0_sh_mask.h"
+#include "dcn/dcn_1_0_offset.h"
+#include "dcn/dcn_1_0_sh_mask.h"
#include "soc15ip.h"
/* begin *********************
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.c b/drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.c
index 8e2dabe..7f7db66 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.c
@@ -29,8 +29,8 @@
#include "../dce110/irq_service_dce110.h"
-#include "raven1/DCN/dcn_1_0_offset.h"
-#include "raven1/DCN/dcn_1_0_sh_mask.h"
+#include "dcn/dcn_1_0_offset.h"
+#include "dcn/dcn_1_0_sh_mask.h"
#include "soc15ip.h"
#include "irq_service_dcn10.h"
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/DCN/dcn_1_0_offset.h b/drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_1_0_offset.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/raven1/DCN/dcn_1_0_offset.h
rename to drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_1_0_offset.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/DCN/dcn_1_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_1_0_sh_mask.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/raven1/DCN/dcn_1_0_sh_mask.h
rename to drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_1_0_sh_mask.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/DCN/dcn_1_0_default.h b/drivers/gpu/drm/amd/include/asic_reg/raven1/DCN/dcn_1_0_default.h
deleted file mode 100644
index eac125c..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] 11+ messages in thread* [PATCH 3/8] drm/amd/include:cleanup raven1 gc header files.
[not found] ` <1511782150-31595-1-git-send-email-Feifei.Xu-5C7GfCeVMHo@public.gmane.org>
2017-11-27 11:29 ` [PATCH 1/8] drm/amd/include:cleanup raven1 sdma " Feifei Xu
2017-11-27 11:29 ` [PATCH 2/8] drm/amd/include:cleanup raven1 dcn " Feifei Xu
@ 2017-11-27 11:29 ` Feifei Xu
2017-11-27 11:29 ` [PATCH 4/8] drm/amd/include:cleanup raven1 mmhub " Feifei Xu
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Feifei Xu @ 2017-11-27 11:29 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alexander.Deucher-5C7GfCeVMHo, Feifei Xu, Ken.Wang-5C7GfCeVMHo,
christian.koenig-5C7GfCeVMHo
Cleanup asic_reg/raven1/GC folder. Remove unused files:
gc_9_1_default.h gc_9_1_sh_mask.h
Change-Id: I51abe8a8f9955cf220eae6f4f72b915b32c3d703
Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 2 +-
.../asic_reg/{raven1/GC => gc}/gc_9_1_offset.h | 0
.../include/asic_reg/raven1/GC/gc_9_1_default.h | 4005 ---
.../include/asic_reg/raven1/GC/gc_9_1_sh_mask.h | 31191 -------------------
4 files changed, 1 insertion(+), 35197 deletions(-)
rename drivers/gpu/drm/amd/include/asic_reg/{raven1/GC => gc}/gc_9_1_offset.h (100%)
delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_default.h
delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_sh_mask.h
diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
index a7ec158..0cf36ac 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
@@ -32,7 +32,7 @@
#include "soc15ip.h"
#include "raven1/MP/mp_10_0_offset.h"
-#include "raven1/GC/gc_9_1_offset.h"
+#include "gc/gc_9_1_offset.h"
#include "sdma0/sdma0_4_1_offset.h"
MODULE_FIRMWARE("amdgpu/raven_asd.bin");
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_offset.h b/drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_1_offset.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_offset.h
rename to drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_1_offset.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_default.h b/drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_default.h
deleted file mode 100644
index 582f1a6..0000000
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_sh_mask.h
deleted file mode 100644
index ab0a25e..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] 11+ messages in thread* [PATCH 4/8] drm/amd/include:cleanup raven1 mmhub header files.
[not found] ` <1511782150-31595-1-git-send-email-Feifei.Xu-5C7GfCeVMHo@public.gmane.org>
` (2 preceding siblings ...)
2017-11-27 11:29 ` [PATCH 3/8] drm/amd/include:cleanup raven1 gc " Feifei Xu
@ 2017-11-27 11:29 ` Feifei Xu
2017-11-27 11:29 ` [PATCH 5/8] drm/amd/include:cleanup raven1 mp " Feifei Xu
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Feifei Xu @ 2017-11-27 11:29 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alexander.Deucher-5C7GfCeVMHo, Feifei Xu, Ken.Wang-5C7GfCeVMHo,
christian.koenig-5C7GfCeVMHo
Cleanup asic_reg/raven1/MMHUB folder.Remove unused mmhub_9_1_default.h
Change-Id: I154b2564ca5875450c3822555b3bf7b98a87f880
Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +-
.../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +-
.../{raven1/MMHUB => mmhub}/mmhub_9_1_offset.h | 0
.../{raven1/MMHUB => mmhub}/mmhub_9_1_sh_mask.h | 0
.../asic_reg/raven1/MMHUB/mmhub_9_1_default.h | 1028 --------------------
5 files changed, 4 insertions(+), 1032 deletions(-)
rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MMHUB => mmhub}/mmhub_9_1_offset.h (100%)
rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MMHUB => mmhub}/mmhub_9_1_sh_mask.h (100%)
delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/MMHUB/mmhub_9_1_default.h
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
index ab92cd7..00eeb8b 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
@@ -32,8 +32,8 @@
#include "raven1/VCN/vcn_1_0_offset.h"
#include "raven1/VCN/vcn_1_0_sh_mask.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"
+#include "mmhub/mmhub_9_1_offset.h"
+#include "mmhub/mmhub_9_1_sh_mask.h"
static int vcn_v1_0_start(struct amdgpu_device *adev);
static int vcn_v1_0_stop(struct amdgpu_device *adev);
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
index 7a12a23..543db74 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
@@ -57,8 +57,8 @@
#include "raven1/NBIO/nbio_7_0_offset.h"
-#include "raven1/MMHUB/mmhub_9_1_offset.h"
-#include "raven1/MMHUB/mmhub_9_1_sh_mask.h"
+#include "mmhub/mmhub_9_1_offset.h"
+#include "mmhub/mmhub_9_1_sh_mask.h"
#include "reg_helper.h"
#include "dce/dce_abm.h"
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/MMHUB/mmhub_9_1_offset.h b/drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_1_offset.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/raven1/MMHUB/mmhub_9_1_offset.h
rename to drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_1_offset.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/MMHUB/mmhub_9_1_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_1_sh_mask.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/raven1/MMHUB/mmhub_9_1_sh_mask.h
rename to drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_1_sh_mask.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/MMHUB/mmhub_9_1_default.h b/drivers/gpu/drm/amd/include/asic_reg/raven1/MMHUB/mmhub_9_1_default.h
deleted file mode 100644
index 392ef77..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] 11+ messages in thread* [PATCH 5/8] drm/amd/include:cleanup raven1 mp header files.
[not found] ` <1511782150-31595-1-git-send-email-Feifei.Xu-5C7GfCeVMHo@public.gmane.org>
` (3 preceding siblings ...)
2017-11-27 11:29 ` [PATCH 4/8] drm/amd/include:cleanup raven1 mmhub " Feifei Xu
@ 2017-11-27 11:29 ` Feifei Xu
2017-11-27 11:29 ` [PATCH 6/8] drm/amd/include:cleanup raven1 nbio " Feifei Xu
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Feifei Xu @ 2017-11-27 11:29 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alexander.Deucher-5C7GfCeVMHo, Feifei Xu, Ken.Wang-5C7GfCeVMHo,
christian.koenig-5C7GfCeVMHo
Cleanup asic_reg/raven1/MP folder.
Change-Id: Idda7bb5b39b479f7a408089de5eb135d739816a0
Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 2 +-
.../drm/amd/include/asic_reg/{raven1/MP => mp}/mp_10_0_default.h | 0
.../gpu/drm/amd/include/asic_reg/{raven1/MP => mp}/mp_10_0_offset.h | 0
.../drm/amd/include/asic_reg/{raven1/MP => mp}/mp_10_0_sh_mask.h | 0
drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h | 6 +++---
5 files changed, 4 insertions(+), 4 deletions(-)
rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MP => mp}/mp_10_0_default.h (100%)
rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MP => mp}/mp_10_0_offset.h (100%)
rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MP => mp}/mp_10_0_sh_mask.h (100%)
diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
index 0cf36ac..78fe3f2 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
@@ -31,7 +31,7 @@
#include "psp_v10_0.h"
#include "soc15ip.h"
-#include "raven1/MP/mp_10_0_offset.h"
+#include "mp/mp_10_0_offset.h"
#include "gc/gc_9_1_offset.h"
#include "sdma0/sdma0_4_1_offset.h"
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/MP/mp_10_0_default.h b/drivers/gpu/drm/amd/include/asic_reg/mp/mp_10_0_default.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/raven1/MP/mp_10_0_default.h
rename to drivers/gpu/drm/amd/include/asic_reg/mp/mp_10_0_default.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/MP/mp_10_0_offset.h b/drivers/gpu/drm/amd/include/asic_reg/mp/mp_10_0_offset.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/raven1/MP/mp_10_0_offset.h
rename to drivers/gpu/drm/amd/include/asic_reg/mp/mp_10_0_offset.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/MP/mp_10_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/mp/mp_10_0_sh_mask.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/raven1/MP/mp_10_0_sh_mask.h
rename to drivers/gpu/drm/amd/include/asic_reg/mp/mp_10_0_sh_mask.h
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h b/drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h
index 9a01493..94961c7 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h
@@ -25,9 +25,9 @@
#define RAVEN_INC_H
-#include "asic_reg/raven1/MP/mp_10_0_default.h"
-#include "asic_reg/raven1/MP/mp_10_0_offset.h"
-#include "asic_reg/raven1/MP/mp_10_0_sh_mask.h"
+#include "asic_reg/mp/mp_10_0_default.h"
+#include "asic_reg/mp/mp_10_0_offset.h"
+#include "asic_reg/mp/mp_10_0_sh_mask.h"
#include "asic_reg/raven1/NBIO/nbio_7_0_default.h"
#include "asic_reg/raven1/NBIO/nbio_7_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] 11+ messages in thread* [PATCH 6/8] drm/amd/include:cleanup raven1 nbio header files.
[not found] ` <1511782150-31595-1-git-send-email-Feifei.Xu-5C7GfCeVMHo@public.gmane.org>
` (4 preceding siblings ...)
2017-11-27 11:29 ` [PATCH 5/8] drm/amd/include:cleanup raven1 mp " Feifei Xu
@ 2017-11-27 11:29 ` Feifei Xu
2017-11-27 11:29 ` [PATCH 7/8] drm/amd/include:cleanup raven1 thm " Feifei Xu
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Feifei Xu @ 2017-11-27 11:29 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alexander.Deucher-5C7GfCeVMHo, Feifei Xu, Ken.Wang-5C7GfCeVMHo,
christian.koenig-5C7GfCeVMHo
Cleanup asic_reg/raven1/NBIO folder.
Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
Change-Id: Icaf08a09d6db5f2d52b1bb9ce855f2e3de5431e1
---
drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 6 +++---
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 2 +-
.../amd/include/asic_reg/{raven1/NBIO => nbio}/nbio_7_0_default.h | 0
.../amd/include/asic_reg/{raven1/NBIO => nbio}/nbio_7_0_offset.h | 0
.../amd/include/asic_reg/{raven1/NBIO => nbio}/nbio_7_0_sh_mask.h | 0
drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h | 6 +++---
6 files changed, 7 insertions(+), 7 deletions(-)
rename drivers/gpu/drm/amd/include/asic_reg/{raven1/NBIO => nbio}/nbio_7_0_default.h (100%)
rename drivers/gpu/drm/amd/include/asic_reg/{raven1/NBIO => nbio}/nbio_7_0_offset.h (100%)
rename drivers/gpu/drm/amd/include/asic_reg/{raven1/NBIO => nbio}/nbio_7_0_sh_mask.h (100%)
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c
index 8ddc44b..1fb7717 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c
@@ -25,9 +25,9 @@
#include "nbio_v7_0.h"
#include "soc15ip.h"
-#include "raven1/NBIO/nbio_7_0_default.h"
-#include "raven1/NBIO/nbio_7_0_offset.h"
-#include "raven1/NBIO/nbio_7_0_sh_mask.h"
+#include "nbio/nbio_7_0_default.h"
+#include "nbio/nbio_7_0_offset.h"
+#include "nbio/nbio_7_0_sh_mask.h"
#include "vega10_enum.h"
#define smnNBIF_MGCG_CTRL_LCLK 0x1013a05c
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
index 543db74..c40e81b 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
@@ -55,7 +55,7 @@
#include "dcn/dcn_1_0_offset.h"
#include "dcn/dcn_1_0_sh_mask.h"
-#include "raven1/NBIO/nbio_7_0_offset.h"
+#include "nbio/nbio_7_0_offset.h"
#include "mmhub/mmhub_9_1_offset.h"
#include "mmhub/mmhub_9_1_sh_mask.h"
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/NBIO/nbio_7_0_default.h b/drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_0_default.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/raven1/NBIO/nbio_7_0_default.h
rename to drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_0_default.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/NBIO/nbio_7_0_offset.h b/drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_0_offset.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/raven1/NBIO/nbio_7_0_offset.h
rename to drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_0_offset.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/NBIO/nbio_7_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_0_sh_mask.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/raven1/NBIO/nbio_7_0_sh_mask.h
rename to drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_0_sh_mask.h
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h b/drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h
index 94961c7..5fb38f6 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h
@@ -29,9 +29,9 @@
#include "asic_reg/mp/mp_10_0_offset.h"
#include "asic_reg/mp/mp_10_0_sh_mask.h"
-#include "asic_reg/raven1/NBIO/nbio_7_0_default.h"
-#include "asic_reg/raven1/NBIO/nbio_7_0_offset.h"
-#include "asic_reg/raven1/NBIO/nbio_7_0_sh_mask.h"
+#include "asic_reg/nbio/nbio_7_0_default.h"
+#include "asic_reg/nbio/nbio_7_0_offset.h"
+#include "asic_reg/nbio/nbio_7_0_sh_mask.h"
#include "asic_reg/raven1/THM/thm_10_0_default.h"
#include "asic_reg/raven1/THM/thm_10_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] 11+ messages in thread* [PATCH 7/8] drm/amd/include:cleanup raven1 thm header files.
[not found] ` <1511782150-31595-1-git-send-email-Feifei.Xu-5C7GfCeVMHo@public.gmane.org>
` (5 preceding siblings ...)
2017-11-27 11:29 ` [PATCH 6/8] drm/amd/include:cleanup raven1 nbio " Feifei Xu
@ 2017-11-27 11:29 ` Feifei Xu
2017-11-27 11:29 ` [PATCH 8/8] drm/amd/include:cleanup raven1 vcn " Feifei Xu
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Feifei Xu @ 2017-11-27 11:29 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alexander.Deucher-5C7GfCeVMHo, Feifei Xu, Ken.Wang-5C7GfCeVMHo,
christian.koenig-5C7GfCeVMHo
Cleanup asic_reg/raven1/THM folder.
Change-Id: I088cd61f42ee88ccf0c327b139d7a34c0fdadea5
Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
---
.../drm/amd/include/asic_reg/{raven1/THM => thm}/thm_10_0_default.h | 0
.../drm/amd/include/asic_reg/{raven1/THM => thm}/thm_10_0_offset.h | 0
.../drm/amd/include/asic_reg/{raven1/THM => thm}/thm_10_0_sh_mask.h | 0
drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h | 6 +++---
4 files changed, 3 insertions(+), 3 deletions(-)
rename drivers/gpu/drm/amd/include/asic_reg/{raven1/THM => thm}/thm_10_0_default.h (100%)
rename drivers/gpu/drm/amd/include/asic_reg/{raven1/THM => thm}/thm_10_0_offset.h (100%)
rename drivers/gpu/drm/amd/include/asic_reg/{raven1/THM => thm}/thm_10_0_sh_mask.h (100%)
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/THM/thm_10_0_default.h b/drivers/gpu/drm/amd/include/asic_reg/thm/thm_10_0_default.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/raven1/THM/thm_10_0_default.h
rename to drivers/gpu/drm/amd/include/asic_reg/thm/thm_10_0_default.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/THM/thm_10_0_offset.h b/drivers/gpu/drm/amd/include/asic_reg/thm/thm_10_0_offset.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/raven1/THM/thm_10_0_offset.h
rename to drivers/gpu/drm/amd/include/asic_reg/thm/thm_10_0_offset.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/THM/thm_10_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/thm/thm_10_0_sh_mask.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/raven1/THM/thm_10_0_sh_mask.h
rename to drivers/gpu/drm/amd/include/asic_reg/thm/thm_10_0_sh_mask.h
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h b/drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h
index 5fb38f6..ae59a3f 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h
@@ -33,9 +33,9 @@
#include "asic_reg/nbio/nbio_7_0_offset.h"
#include "asic_reg/nbio/nbio_7_0_sh_mask.h"
-#include "asic_reg/raven1/THM/thm_10_0_default.h"
-#include "asic_reg/raven1/THM/thm_10_0_offset.h"
-#include "asic_reg/raven1/THM/thm_10_0_sh_mask.h"
+#include "asic_reg/thm/thm_10_0_default.h"
+#include "asic_reg/thm/thm_10_0_offset.h"
+#include "asic_reg/thm/thm_10_0_sh_mask.h"
#define ixDDI_PHY_GEN_STATUS 0x3FCE8
--
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] 11+ messages in thread* [PATCH 8/8] drm/amd/include:cleanup raven1 vcn header files.
[not found] ` <1511782150-31595-1-git-send-email-Feifei.Xu-5C7GfCeVMHo@public.gmane.org>
` (6 preceding siblings ...)
2017-11-27 11:29 ` [PATCH 7/8] drm/amd/include:cleanup raven1 thm " Feifei Xu
@ 2017-11-27 11:29 ` Feifei Xu
2017-11-27 11:48 ` [PATCH 0/8] Cleanup raven1 " Christian König
2017-11-28 1:53 ` Zhang, Jerry (Junwei)
9 siblings, 0 replies; 11+ messages in thread
From: Feifei Xu @ 2017-11-27 11:29 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alexander.Deucher-5C7GfCeVMHo, Feifei Xu, Ken.Wang-5C7GfCeVMHo,
christian.koenig-5C7GfCeVMHo
Cleanup asic_reg/raven1/VCN folder. Remove unused vcn_1_0_default.h.
Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
Change-Id: Ic9a7796c169c93aa4c5f3c81fa323fc6a5c8ae42
Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 2 +-
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +-
.../include/asic_reg/raven1/VCN/vcn_1_0_default.h | 202 ---------------------
.../asic_reg/{raven1/VCN => vcn}/vcn_1_0_offset.h | 0
.../asic_reg/{raven1/VCN => vcn}/vcn_1_0_sh_mask.h | 0
5 files changed, 3 insertions(+), 205 deletions(-)
delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/VCN/vcn_1_0_default.h
rename drivers/gpu/drm/amd/include/asic_reg/{raven1/VCN => vcn}/vcn_1_0_offset.h (100%)
rename drivers/gpu/drm/amd/include/asic_reg/{raven1/VCN => vcn}/vcn_1_0_sh_mask.h (100%)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index c22c73f..d7ba048 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -36,7 +36,7 @@
#include "soc15_common.h"
#include "soc15ip.h"
-#include "raven1/VCN/vcn_1_0_offset.h"
+#include "vcn/vcn_1_0_offset.h"
/* 1 second timeout */
#define VCN_IDLE_TIMEOUT msecs_to_jiffies(1000)
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
index 00eeb8b..e4673f7 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
@@ -29,8 +29,8 @@
#include "soc15_common.h"
#include "soc15ip.h"
-#include "raven1/VCN/vcn_1_0_offset.h"
-#include "raven1/VCN/vcn_1_0_sh_mask.h"
+#include "vcn/vcn_1_0_offset.h"
+#include "vcn/vcn_1_0_sh_mask.h"
#include "hdp/hdp_4_0_offset.h"
#include "mmhub/mmhub_9_1_offset.h"
#include "mmhub/mmhub_9_1_sh_mask.h"
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/VCN/vcn_1_0_default.h b/drivers/gpu/drm/amd/include/asic_reg/raven1/VCN/vcn_1_0_default.h
deleted file mode 100644
index 5793a10..0000000
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/VCN/vcn_1_0_offset.h b/drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_1_0_offset.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/raven1/VCN/vcn_1_0_offset.h
rename to drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_1_0_offset.h
diff --git a/drivers/gpu/drm/amd/include/asic_reg/raven1/VCN/vcn_1_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_1_0_sh_mask.h
similarity index 100%
rename from drivers/gpu/drm/amd/include/asic_reg/raven1/VCN/vcn_1_0_sh_mask.h
rename to drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_1_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] 11+ messages in thread* Re: [PATCH 0/8] Cleanup raven1 header files.
[not found] ` <1511782150-31595-1-git-send-email-Feifei.Xu-5C7GfCeVMHo@public.gmane.org>
` (7 preceding siblings ...)
2017-11-27 11:29 ` [PATCH 8/8] drm/amd/include:cleanup raven1 vcn " Feifei Xu
@ 2017-11-27 11:48 ` Christian König
2017-11-28 1:53 ` Zhang, Jerry (Junwei)
9 siblings, 0 replies; 11+ messages in thread
From: Christian König @ 2017-11-27 11:48 UTC (permalink / raw)
To: Feifei Xu, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alexander.Deucher-5C7GfCeVMHo, Ken.Wang-5C7GfCeVMHo,
christian.koenig-5C7GfCeVMHo
Am 27.11.2017 um 12:29 schrieb Feifei Xu:
> Remove folder amd/include/asic_reg/raven1 to avoid header files duplication.
> Header files under this folder will be moved to asic_reg/.
>
> Also removed some unused header files of raven1.
>
> Patches are formated with flag --find-renames and --irreversible-delete.
> They are just for reviewing and not meant to be applied with git apply.
Acked-by: Christian König <christian.koenig@amd.com> for the whole series.
>
> Feifei Xu (8):
> drm/amd/include:cleanup raven1 sdma header files.
> drm/amd/include:cleanup raven1 dcn header files.
> drm/amd/include:cleanup raven1 gc header files.
> drm/amd/include:cleanup raven1 mmhub header files.
> drm/amd/include:cleanup raven1 mp header files.
> drm/amd/include:cleanup raven1 nbio header files.
> drm/amd/include:cleanup raven1 thm header files.
> drm/amd/include:cleanup raven1 vcn header files.
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 6 +-
> drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 6 +-
> drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 8 +-
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
> .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 10 +-
> .../amd/display/dc/gpio/dcn10/hw_factory_dcn10.c | 4 +-
> .../amd/display/dc/gpio/dcn10/hw_translate_dcn10.c | 4 +-
> .../drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.c | 4 +-
> .../amd/display/dc/irq/dcn10/irq_service_dcn10.c | 4 +-
> .../asic_reg/{raven1/DCN => dcn}/dcn_1_0_offset.h | 0
> .../asic_reg/{raven1/DCN => dcn}/dcn_1_0_sh_mask.h | 0
> .../asic_reg/{raven1/GC => gc}/gc_9_1_offset.h | 0
> .../{raven1/MMHUB => mmhub}/mmhub_9_1_offset.h | 0
> .../{raven1/MMHUB => mmhub}/mmhub_9_1_sh_mask.h | 0
> .../asic_reg/{raven1/MP => mp}/mp_10_0_default.h | 0
> .../asic_reg/{raven1/MP => mp}/mp_10_0_offset.h | 0
> .../asic_reg/{raven1/MP => mp}/mp_10_0_sh_mask.h | 0
> .../{raven1/NBIO => nbio}/nbio_7_0_default.h | 0
> .../{raven1/NBIO => nbio}/nbio_7_0_offset.h | 0
> .../{raven1/NBIO => nbio}/nbio_7_0_sh_mask.h | 0
> .../include/asic_reg/raven1/DCN/dcn_1_0_default.h | 7988 -----
> .../include/asic_reg/raven1/GC/gc_9_1_default.h | 4005 ---
> .../include/asic_reg/raven1/GC/gc_9_1_sh_mask.h | 31191 -------------------
> .../asic_reg/raven1/MMHUB/mmhub_9_1_default.h | 1028 -
> .../asic_reg/raven1/SDMA0/sdma0_4_1_sh_mask.h | 1658 -
> .../include/asic_reg/raven1/VCN/vcn_1_0_default.h | 202 -
> .../{raven1/SDMA0 => sdma0}/sdma0_4_1_default.h | 0
> .../{raven1/SDMA0 => sdma0}/sdma0_4_1_offset.h | 0
> .../{raven1/THM => thm}/thm_10_0_default.h | 0
> .../asic_reg/{raven1/THM => thm}/thm_10_0_offset.h | 0
> .../{raven1/THM => thm}/thm_10_0_sh_mask.h | 0
> .../asic_reg/{raven1/VCN => vcn}/vcn_1_0_offset.h | 0
> .../asic_reg/{raven1/VCN => vcn}/vcn_1_0_sh_mask.h | 0
> drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h | 18 +-
> 36 files changed, 36 insertions(+), 46108 deletions(-)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/DCN => dcn}/dcn_1_0_offset.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/DCN => dcn}/dcn_1_0_sh_mask.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/GC => gc}/gc_9_1_offset.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MMHUB => mmhub}/mmhub_9_1_offset.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MMHUB => mmhub}/mmhub_9_1_sh_mask.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MP => mp}/mp_10_0_default.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MP => mp}/mp_10_0_offset.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MP => mp}/mp_10_0_sh_mask.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/NBIO => nbio}/nbio_7_0_default.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/NBIO => nbio}/nbio_7_0_offset.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/NBIO => nbio}/nbio_7_0_sh_mask.h (100%)
> delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/DCN/dcn_1_0_default.h
> delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_default.h
> delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_sh_mask.h
> delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/MMHUB/mmhub_9_1_default.h
> delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/SDMA0/sdma0_4_1_sh_mask.h
> delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/VCN/vcn_1_0_default.h
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/SDMA0 => sdma0}/sdma0_4_1_default.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/SDMA0 => sdma0}/sdma0_4_1_offset.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/THM => thm}/thm_10_0_default.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/THM => thm}/thm_10_0_offset.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/THM => thm}/thm_10_0_sh_mask.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/VCN => vcn}/vcn_1_0_offset.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/VCN => vcn}/vcn_1_0_sh_mask.h (100%)
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 0/8] Cleanup raven1 header files.
[not found] ` <1511782150-31595-1-git-send-email-Feifei.Xu-5C7GfCeVMHo@public.gmane.org>
` (8 preceding siblings ...)
2017-11-27 11:48 ` [PATCH 0/8] Cleanup raven1 " Christian König
@ 2017-11-28 1:53 ` Zhang, Jerry (Junwei)
9 siblings, 0 replies; 11+ messages in thread
From: Zhang, Jerry (Junwei) @ 2017-11-28 1:53 UTC (permalink / raw)
To: Feifei Xu, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alexander.Deucher-5C7GfCeVMHo, Ken.Wang-5C7GfCeVMHo,
christian.koenig-5C7GfCeVMHo
On 11/27/2017 07:29 PM, Feifei Xu wrote:
> Remove folder amd/include/asic_reg/raven1 to avoid header files duplication.
> Header files under this folder will be moved to asic_reg/.
>
> Also removed some unused header files of raven1.
>
> Patches are formated with flag --find-renames and --irreversible-delete.
> They are just for reviewing and not meant to be applied with git apply.
Thanks for raven1 clean up.
(About removed files, Raven could share some headers with vega10, I think)
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
>
> Feifei Xu (8):
> drm/amd/include:cleanup raven1 sdma header files.
> drm/amd/include:cleanup raven1 dcn header files.
> drm/amd/include:cleanup raven1 gc header files.
> drm/amd/include:cleanup raven1 mmhub header files.
> drm/amd/include:cleanup raven1 mp header files.
> drm/amd/include:cleanup raven1 nbio header files.
> drm/amd/include:cleanup raven1 thm header files.
> drm/amd/include:cleanup raven1 vcn header files.
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 6 +-
> drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 6 +-
> drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 8 +-
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
> .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 10 +-
> .../amd/display/dc/gpio/dcn10/hw_factory_dcn10.c | 4 +-
> .../amd/display/dc/gpio/dcn10/hw_translate_dcn10.c | 4 +-
> .../drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.c | 4 +-
> .../amd/display/dc/irq/dcn10/irq_service_dcn10.c | 4 +-
> .../asic_reg/{raven1/DCN => dcn}/dcn_1_0_offset.h | 0
> .../asic_reg/{raven1/DCN => dcn}/dcn_1_0_sh_mask.h | 0
> .../asic_reg/{raven1/GC => gc}/gc_9_1_offset.h | 0
> .../{raven1/MMHUB => mmhub}/mmhub_9_1_offset.h | 0
> .../{raven1/MMHUB => mmhub}/mmhub_9_1_sh_mask.h | 0
> .../asic_reg/{raven1/MP => mp}/mp_10_0_default.h | 0
> .../asic_reg/{raven1/MP => mp}/mp_10_0_offset.h | 0
> .../asic_reg/{raven1/MP => mp}/mp_10_0_sh_mask.h | 0
> .../{raven1/NBIO => nbio}/nbio_7_0_default.h | 0
> .../{raven1/NBIO => nbio}/nbio_7_0_offset.h | 0
> .../{raven1/NBIO => nbio}/nbio_7_0_sh_mask.h | 0
> .../include/asic_reg/raven1/DCN/dcn_1_0_default.h | 7988 -----
> .../include/asic_reg/raven1/GC/gc_9_1_default.h | 4005 ---
> .../include/asic_reg/raven1/GC/gc_9_1_sh_mask.h | 31191 -------------------
> .../asic_reg/raven1/MMHUB/mmhub_9_1_default.h | 1028 -
> .../asic_reg/raven1/SDMA0/sdma0_4_1_sh_mask.h | 1658 -
> .../include/asic_reg/raven1/VCN/vcn_1_0_default.h | 202 -
> .../{raven1/SDMA0 => sdma0}/sdma0_4_1_default.h | 0
> .../{raven1/SDMA0 => sdma0}/sdma0_4_1_offset.h | 0
> .../{raven1/THM => thm}/thm_10_0_default.h | 0
> .../asic_reg/{raven1/THM => thm}/thm_10_0_offset.h | 0
> .../{raven1/THM => thm}/thm_10_0_sh_mask.h | 0
> .../asic_reg/{raven1/VCN => vcn}/vcn_1_0_offset.h | 0
> .../asic_reg/{raven1/VCN => vcn}/vcn_1_0_sh_mask.h | 0
> drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h | 18 +-
> 36 files changed, 36 insertions(+), 46108 deletions(-)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/DCN => dcn}/dcn_1_0_offset.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/DCN => dcn}/dcn_1_0_sh_mask.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/GC => gc}/gc_9_1_offset.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MMHUB => mmhub}/mmhub_9_1_offset.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MMHUB => mmhub}/mmhub_9_1_sh_mask.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MP => mp}/mp_10_0_default.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MP => mp}/mp_10_0_offset.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MP => mp}/mp_10_0_sh_mask.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/NBIO => nbio}/nbio_7_0_default.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/NBIO => nbio}/nbio_7_0_offset.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/NBIO => nbio}/nbio_7_0_sh_mask.h (100%)
> delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/DCN/dcn_1_0_default.h
> delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_default.h
> delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_sh_mask.h
> delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/MMHUB/mmhub_9_1_default.h
> delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/SDMA0/sdma0_4_1_sh_mask.h
> delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/VCN/vcn_1_0_default.h
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/SDMA0 => sdma0}/sdma0_4_1_default.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/SDMA0 => sdma0}/sdma0_4_1_offset.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/THM => thm}/thm_10_0_default.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/THM => thm}/thm_10_0_offset.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/THM => thm}/thm_10_0_sh_mask.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/VCN => vcn}/vcn_1_0_offset.h (100%)
> rename drivers/gpu/drm/amd/include/asic_reg/{raven1/VCN => vcn}/vcn_1_0_sh_mask.h (100%)
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread