Classify DCE6 resource and sequencer as they are for other DCE versions
Put dce60_resource.c and .h under amd/display/dc/resource/dce60
Put and rename dce60_hw_sequencer.c and .h under amd/display/dc/hwss/dce60
Signed-off-by: Alexandre Demers <alexandre.f.dem...@gmail.com>
---
drivers/gpu/drm/amd/display/dc/dce60/Makefile | 3 +--
drivers/gpu/drm/amd/display/dc/hwss/Makefile | 24 ++++++++++++-------
.../dce60/dce60_hwseq.c} | 2 +-
.../dce60/dce60_hwseq.h} | 0
.../gpu/drm/amd/display/dc/resource/Makefile | 24 ++++++++++++-------
.../dc/{ => resource}/dce60/dce60_resource.c | 2 +-
.../dc/{ => resource}/dce60/dce60_resource.h | 0
7 files changed, 35 insertions(+), 20 deletions(-)
rename drivers/gpu/drm/amd/display/dc/{dce60/dce60_hw_sequencer.c =>
hwss/dce60/dce60_hwseq.c} (99%)
rename drivers/gpu/drm/amd/display/dc/{dce60/dce60_hw_sequencer.h =>
hwss/dce60/dce60_hwseq.h} (100%)
rename drivers/gpu/drm/amd/display/dc/{ => resource}/dce60/dce60_resource.c
(99%)
rename drivers/gpu/drm/amd/display/dc/{ => resource}/dce60/dce60_resource.h
(100%)
diff --git a/drivers/gpu/drm/amd/display/dc/dce60/Makefile
b/drivers/gpu/drm/amd/display/dc/dce60/Makefile
index eede83ad91fa..824f73eb3326 100644
--- a/drivers/gpu/drm/amd/display/dc/dce60/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dce60/Makefile
@@ -25,8 +25,7 @@
CFLAGS_$(AMDDALPATH)/dc/dce60/dce60_resource.o = -Wno-override-init
-DCE60 = dce60_timing_generator.o dce60_hw_sequencer.o \
- dce60_resource.o
+DCE60 = dce60_timing_generator.o
AMD_DAL_DCE60 = $(addprefix $(AMDDALPATH)/dc/dce60/,$(DCE60))
diff --git a/drivers/gpu/drm/amd/display/dc/hwss/Makefile
b/drivers/gpu/drm/amd/display/dc/hwss/Makefile
index 40ecebea1ba0..49079cc2a255 100644
--- a/drivers/gpu/drm/amd/display/dc/hwss/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/hwss/Makefile
@@ -27,6 +27,22 @@
# DCE
###############################################################################
+HWSS_DCE60 = dce60_hwseq.o
+
+AMD_DAL_HWSS_DCE60 = $(addprefix $(AMDDALPATH)/dc/hwss/dce60/,$(HWSS_DCE60))
+
+AMD_DISPLAY_FILES += $(AMD_DAL_HWSS_DCE60)
+
+###############################################################################
+
+HWSS_DCE80 = dce80_hwseq.o
+
+AMD_DAL_HWSS_DCE80 = $(addprefix $(AMDDALPATH)/dc/hwss/dce80/,$(HWSS_DCE80))
+
+AMD_DISPLAY_FILES += $(AMD_DAL_HWSS_DCE80)
+
+###############################################################################
+
HWSS_DCE = dce_hwseq.o
AMD_DAL_HWSS_DCE = $(addprefix $(AMDDALPATH)/dc/hwss/dce/,$(HWSS_DCE))
@@ -65,14 +81,6 @@ AMD_DAL_HWSS_DCE120 = $(addprefix
$(AMDDALPATH)/dc/hwss/dce120/,$(HWSS_DCE120))
AMD_DISPLAY_FILES += $(AMD_DAL_HWSS_DCE120)
-###############################################################################
-
-HWSS_DCE80 = dce80_hwseq.o
-
-AMD_DAL_HWSS_DCE80 = $(addprefix $(AMDDALPATH)/dc/hwss/dce80/,$(HWSS_DCE80))
-
-AMD_DISPLAY_FILES += $(AMD_DAL_HWSS_DCE80)
-
ifdef CONFIG_DRM_AMD_DC_FP
###############################################################################
# DCN
diff --git a/drivers/gpu/drm/amd/display/dc/dce60/dce60_hw_sequencer.c
b/drivers/gpu/drm/amd/display/dc/hwss/dce60/dce60_hwseq.c
similarity index 99%
rename from drivers/gpu/drm/amd/display/dc/dce60/dce60_hw_sequencer.c
rename to drivers/gpu/drm/amd/display/dc/hwss/dce60/dce60_hwseq.c
index 1fdeef47e4dc..d503bd054558 100644
--- a/drivers/gpu/drm/amd/display/dc/dce60/dce60_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dce60/dce60_hwseq.c
@@ -26,7 +26,7 @@
#include "dm_services.h"
#include "dc.h"
#include "core_types.h"
-#include "dce60_hw_sequencer.h"
+#include "dce60_hwseq.h"
#include "dce/dce_hwseq.h"
#include "dce110/dce110_hwseq.h"
diff --git a/drivers/gpu/drm/amd/display/dc/dce60/dce60_hw_sequencer.h
b/drivers/gpu/drm/amd/display/dc/hwss/dce60/dce60_hwseq.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dce60/dce60_hw_sequencer.h
rename to drivers/gpu/drm/amd/display/dc/hwss/dce60/dce60_hwseq.h
diff --git a/drivers/gpu/drm/amd/display/dc/resource/Makefile
b/drivers/gpu/drm/amd/display/dc/resource/Makefile
index 09320344d8e9..7f38957e81ad 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/resource/Makefile
@@ -27,6 +27,22 @@
# DCE
###############################################################################
+RESOURCE_DCE60 = dce60_resource.o
+
+AMD_DAL_RESOURCE_DCE60 = $(addprefix
$(AMDDALPATH)/dc/resource/dce60/,$(RESOURCE_DCE60))
+
+AMD_DISPLAY_FILES += $(AMD_DAL_RESOURCE_DCE60)
+
+###############################################################################
+
+RESOURCE_DCE80 = dce80_resource.o
+
+AMD_DAL_RESOURCE_DCE80 = $(addprefix
$(AMDDALPATH)/dc/resource/dce80/,$(RESOURCE_DCE80))
+
+AMD_DISPLAY_FILES += $(AMD_DAL_RESOURCE_DCE80)
+
+###############################################################################
+
RESOURCE_DCE100 = dce100_resource.o
AMD_DAL_RESOURCE_DCE100 = $(addprefix
$(AMDDALPATH)/dc/resource/dce100/,$(RESOURCE_DCE100))
@@ -57,14 +73,6 @@ AMD_DAL_RESOURCE_DCE120 = $(addprefix
$(AMDDALPATH)/dc/resource/dce120/,$(RESOUR
AMD_DISPLAY_FILES += $(AMD_DAL_RESOURCE_DCE120)
-###############################################################################
-
-RESOURCE_DCE80 = dce80_resource.o
-
-AMD_DAL_RESOURCE_DCE80 = $(addprefix
$(AMDDALPATH)/dc/resource/dce80/,$(RESOURCE_DCE80))
-
-AMD_DISPLAY_FILES += $(AMD_DAL_RESOURCE_DCE80)
-
ifdef CONFIG_DRM_AMD_DC_FP
###############################################################################
# DCN
diff --git a/drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c
b/drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c
similarity index 99%
rename from drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c
rename to drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c
index 889f314cac65..737c1b1d861a 100644
--- a/drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c
@@ -48,7 +48,7 @@
#include "dce/dce_clock_source.h"
#include "dce/dce_audio.h"
#include "dce/dce_hwseq.h"
-#include "dce60/dce60_hw_sequencer.h"
+#include "dce60/dce60_hwseq.h"
#include "dce100/dce100_resource.h"
#include "dce/dce_panel_cntl.h"
diff --git a/drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.h
b/drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.h
rename to drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.h
--
2.49.0
