drm/amd/display: Refactor DCCG into component folder

[why]
cleaning up the code refactor requires dccg to be in its own component.

[how]
move all files under newly created dccg folder and fixing the
makefiles.

Reviewed-by: Martin Leung <martin.leung@amd.com>
Acked-by: Tom Chung <chiahsuan.chung@amd.com>
Signed-off-by: Revalla Hari Krishna <harikrishna.revalla@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/Makefile b/drivers/gpu/drm/amd/display/Makefile
index 839e71aa7d0c57c17760062cda3c973de1923f34..641073fd7e33e70f2067581784adb0b5b2c868dc 100644 (file)
--- a/drivers/gpu/drm/amd/display/Makefile
+++ b/drivers/gpu/drm/amd/display/Makefile
@@ -35,6 +35,7 @@ subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/dsc
 subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/optc
 subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/dpp
 subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/hubbub
+subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/dccg
 subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/modules/inc
 subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/modules/freesync
 subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/modules/color

diff --git a/drivers/gpu/drm/amd/display/dc/Makefile b/drivers/gpu/drm/amd/display/dc/Makefile
index f1b0b1f66fb0b1c4fa0e1eb50fc1fa46ba016496..e0c67f4b9063676bfa1baf8742a68d4cb13f4601 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/Makefile
@@ -22,7 +22,7 @@
 #
 # Makefile for Display Core (dc) component.
 
-DC_LIBS = basics bios dml clk_mgr dce gpio hwss irq link virtual dsc resource optc dpp hubbub
+DC_LIBS = basics bios dml clk_mgr dce gpio hwss irq link virtual dsc resource optc dpp hubbub dccg
 
 ifdef CONFIG_DRM_AMD_DC_FP
 

diff --git a/drivers/gpu/drm/amd/display/dc/dccg/Makefile b/drivers/gpu/drm/amd/display/dc/dccg/Makefile
new file mode 100644 (file)
index 0000000..bfdce98
--- /dev/null
+++ b/drivers/gpu/drm/amd/display/dc/dccg/Makefile
@@ -0,0 +1,98 @@
+
+# Copyright 2022 Advanced Micro Devices, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# Makefile for the 'dccg' sub-component of DAL.
+#
+ifdef CONFIG_DRM_AMD_DC_FP
+###############################################################################
+# DCN
+###############################################################################
+
+DCCG_DCN20 = dcn20_dccg.o
+
+AMD_DAL_DCCG_DCN20 = $(addprefix $(AMDDALPATH)/dc/dccg/dcn20/,$(DCCG_DCN20))
+
+AMD_DISPLAY_FILES += $(AMD_DAL_DCCG_DCN20)
+
+###############################################################################
+
+DCCG_DCN201 = dcn201_dccg.o
+
+AMD_DAL_DCCG_DCN201 = $(addprefix $(AMDDALPATH)/dc/dccg/dcn201/,$(DCCG_DCN201))
+
+AMD_DISPLAY_FILES += $(AMD_DAL_DCCG_DCN201)
+
+###############################################################################
+
+DCCG_DCN21 = dcn21_dccg.o
+
+AMD_DAL_DCCG_DCN21 = $(addprefix $(AMDDALPATH)/dc/dccg/dcn21/,$(DCCG_DCN21))
+
+AMD_DISPLAY_FILES += $(AMD_DAL_DCCG_DCN21)
+
+###############################################################################
+DCCG_DCN30 = dcn30_dccg.o
+
+AMD_DAL_DCCG_DCN30 = $(addprefix $(AMDDALPATH)/dc/dccg/dcn30/,$(DCCG_DCN30))
+
+AMD_DISPLAY_FILES += $(AMD_DAL_DCCG_DCN30)
+
+###############################################################################
+DCCG_DCN301 = dcn301_dccg.o
+
+AMD_DAL_DCCG_DCN301 = $(addprefix $(AMDDALPATH)/dc/dccg/dcn301/,$(DCCG_DCN301))
+
+AMD_DISPLAY_FILES += $(AMD_DAL_DCCG_DCN301)
+
+###############################################################################
+
+DCCG_DCN31 = dcn31_dccg.o
+
+AMD_DAL_DCCG_DCN31 = $(addprefix $(AMDDALPATH)/dc/dccg/dcn31/,$(DCCG_DCN31))
+
+AMD_DISPLAY_FILES += $(AMD_DAL_DCCG_DCN31)
+
+###############################################################################
+
+DCCG_DCN314 = dcn314_dccg.o
+
+AMD_DAL_DCCG_DCN314 = $(addprefix $(AMDDALPATH)/dc/dccg/dcn314/,$(DCCG_DCN314))
+
+AMD_DISPLAY_FILES += $(AMD_DAL_DCCG_DCN314)
+
+###############################################################################
+
+DCCG_DCN32 = dcn32_dccg.o
+
+AMD_DAL_DCCG_DCN32 = $(addprefix $(AMDDALPATH)/dc/dccg/dcn32/,$(DCCG_DCN32))
+
+AMD_DISPLAY_FILES += $(AMD_DAL_DCCG_DCN32)
+
+###############################################################################
+
+DCCG_DCN35 = dcn35_dccg.o
+
+AMD_DAL_DCCG_DCN35 = $(addprefix $(AMDDALPATH)/dc/dccg/dcn35/,$(DCCG_DCN35))
+
+AMD_DISPLAY_FILES += $(AMD_DAL_DCCG_DCN35)
+
+###############################################################################
+endif
\ No newline at end of file

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c b/drivers/gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.c
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c
rename to drivers/gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.c

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h b/drivers/gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h
rename to drivers/gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.h

diff --git a/drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dccg.c b/drivers/gpu/drm/amd/display/dc/dccg/dcn201/dcn201_dccg.c
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dccg.c
rename to drivers/gpu/drm/amd/display/dc/dccg/dcn201/dcn201_dccg.c

diff --git a/drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dccg.h b/drivers/gpu/drm/amd/display/dc/dccg/dcn201/dcn201_dccg.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dccg.h
rename to drivers/gpu/drm/amd/display/dc/dccg/dcn201/dcn201_dccg.h

diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.c b/drivers/gpu/drm/amd/display/dc/dccg/dcn21/dcn21_dccg.c
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.c
rename to drivers/gpu/drm/amd/display/dc/dccg/dcn21/dcn21_dccg.c

diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.h b/drivers/gpu/drm/amd/display/dc/dccg/dcn21/dcn21_dccg.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.h
rename to drivers/gpu/drm/amd/display/dc/dccg/dcn21/dcn21_dccg.h

diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.c b/drivers/gpu/drm/amd/display/dc/dccg/dcn30/dcn30_dccg.c
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.c
rename to drivers/gpu/drm/amd/display/dc/dccg/dcn30/dcn30_dccg.c

diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.h b/drivers/gpu/drm/amd/display/dc/dccg/dcn30/dcn30_dccg.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.h
rename to drivers/gpu/drm/amd/display/dc/dccg/dcn30/dcn30_dccg.h

diff --git a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dccg.c b/drivers/gpu/drm/amd/display/dc/dccg/dcn301/dcn301_dccg.c
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dccg.c
rename to drivers/gpu/drm/amd/display/dc/dccg/dcn301/dcn301_dccg.c

diff --git a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dccg.h b/drivers/gpu/drm/amd/display/dc/dccg/dcn301/dcn301_dccg.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dccg.h
rename to drivers/gpu/drm/amd/display/dc/dccg/dcn301/dcn301_dccg.h

diff --git a/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_dccg.h b/drivers/gpu/drm/amd/display/dc/dccg/dcn302/dcn302_dccg.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dcn302/dcn302_dccg.h
rename to drivers/gpu/drm/amd/display/dc/dccg/dcn302/dcn302_dccg.h

diff --git a/drivers/gpu/drm/amd/display/dc/dcn303/dcn303_dccg.h b/drivers/gpu/drm/amd/display/dc/dccg/dcn303/dcn303_dccg.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dcn303/dcn303_dccg.h
rename to drivers/gpu/drm/amd/display/dc/dccg/dcn303/dcn303_dccg.h

diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c b/drivers/gpu/drm/amd/display/dc/dccg/dcn31/dcn31_dccg.c
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c
rename to drivers/gpu/drm/amd/display/dc/dccg/dcn31/dcn31_dccg.c

diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h b/drivers/gpu/drm/amd/display/dc/dccg/dcn31/dcn31_dccg.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h
rename to drivers/gpu/drm/amd/display/dc/dccg/dcn31/dcn31_dccg.h

diff --git a/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c b/drivers/gpu/drm/amd/display/dc/dccg/dcn314/dcn314_dccg.c
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c
rename to drivers/gpu/drm/amd/display/dc/dccg/dcn314/dcn314_dccg.c

diff --git a/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.h b/drivers/gpu/drm/amd/display/dc/dccg/dcn314/dcn314_dccg.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.h
rename to drivers/gpu/drm/amd/display/dc/dccg/dcn314/dcn314_dccg.h

diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c b/drivers/gpu/drm/amd/display/dc/dccg/dcn32/dcn32_dccg.c
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c
rename to drivers/gpu/drm/amd/display/dc/dccg/dcn32/dcn32_dccg.c

diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.h b/drivers/gpu/drm/amd/display/dc/dccg/dcn32/dcn32_dccg.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.h
rename to drivers/gpu/drm/amd/display/dc/dccg/dcn32/dcn32_dccg.h

diff --git a/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.c b/drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.c
rename to drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c

diff --git a/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.h b/drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.h
rename to drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.h

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/Makefile b/drivers/gpu/drm/amd/display/dc/dcn20/Makefile
index c78f3b0ff4fbf243a371ea2db8bf0b0002c50761..33cbd871eb3a49f23c092d34b3565116763257cd 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn20/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/Makefile
@@ -3,7 +3,7 @@
 
 DCN20 = dcn20_hubp.o \
                dcn20_mpc.o dcn20_opp.o dcn20_mmhubbub.o \
-               dcn20_stream_encoder.o dcn20_link_encoder.o dcn20_dccg.o \
+               dcn20_stream_encoder.o dcn20_link_encoder.o \
                dcn20_vmid.o dcn20_dwb.o dcn20_dwb_scl.o
 
 AMD_DAL_DCN20 = $(addprefix $(AMDDALPATH)/dc/dcn20/,$(DCN20))

diff --git a/drivers/gpu/drm/amd/display/dc/dcn201/Makefile b/drivers/gpu/drm/amd/display/dc/dcn201/Makefile
index ba688bce4951b9188f8f65b897a0d21b7766a73a..7b7acadfccf7fb445464ec03c5861369e90baef0 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn201/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dcn201/Makefile
@@ -2,7 +2,7 @@
 # Copyright © 2021-2024 Advanced Micro Devices, Inc. All rights reserved.
 
 DCN201 = dcn201_mpc.o dcn201_hubp.o dcn201_opp.o \
-       dcn201_dccg.o dcn201_link_encoder.o
+       dcn201_link_encoder.o
 
 AMD_DAL_DCN201 = $(addprefix $(AMDDALPATH)/dc/dcn201/,$(DCN201))
 

diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/Makefile b/drivers/gpu/drm/amd/display/dc/dcn21/Makefile
index 81d565d84ff05b7a27017cdccbb725c74faaae22..720f1a463b89c378e46ae1a531ae2498b7dd5b39 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn21/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dcn21/Makefile
@@ -2,7 +2,7 @@
 # Copyright © 2019-2024 Advanced Micro Devices, Inc. All rights reserved.
 
 DCN21 = dcn21_hubp.o \
-        dcn21_link_encoder.o dcn21_dccg.o
+        dcn21_link_encoder.o
 
 AMD_DAL_DCN21 = $(addprefix $(AMDDALPATH)/dc/dcn21/,$(DCN21))
 

diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/Makefile b/drivers/gpu/drm/amd/display/dc/dcn30/Makefile
index 435979febb79929a727e30afd2dbc71a350ce295..fb7471435c69b1fc3ea2d26c709311b8c05c8430 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn30/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dcn30/Makefile
@@ -24,7 +24,6 @@
 #
 
 DCN30 := dcn30_hubp.o \
-       dcn30_dccg.o \
        dcn30_mpc.o dcn30_vpg.o \
        dcn30_afmt.o \
        dcn30_dio_stream_encoder.o \

diff --git a/drivers/gpu/drm/amd/display/dc/dcn301/Makefile b/drivers/gpu/drm/amd/display/dc/dcn301/Makefile
index bfda72fa4f4251fcfce7de73ac4c6d47301c819c..fadf5e872e38f58321ff80958d5ce8a1f7c6a387 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn301/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dcn301/Makefile
@@ -10,8 +10,7 @@
 #
 # Makefile for dcn30.
 
-DCN301 = dcn301_dccg.o \
-               dcn301_dio_link_encoder.o dcn301_panel_cntl.o
+DCN301 = dcn301_dio_link_encoder.o dcn301_panel_cntl.o
 
 AMD_DAL_DCN301 = $(addprefix $(AMDDALPATH)/dc/dcn301/,$(DCN301))
 

diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/Makefile b/drivers/gpu/drm/amd/display/dc/dcn31/Makefile
index 9608c1f418ab644fe4a947ff3b7b64564f5c57fc..7daa2f038c97817c10398b5f8a8ccf880c0471b4 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn31/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dcn31/Makefile
@@ -11,7 +11,7 @@
 # Makefile for dcn31.
 
 DCN31 = dcn31_hubp.o \
-       dcn31_dccg.o dcn31_dio_link_encoder.o dcn31_panel_cntl.o \
+       dcn31_dio_link_encoder.o dcn31_panel_cntl.o \
        dcn31_apg.o dcn31_hpo_dp_stream_encoder.o dcn31_hpo_dp_link_encoder.o \
        dcn31_afmt.o dcn31_vpg.o
 

diff --git a/drivers/gpu/drm/amd/display/dc/dcn314/Makefile b/drivers/gpu/drm/amd/display/dc/dcn314/Makefile
index b134ab05aa71267d406cc2292ba7bbfd7474b1ea..cac756c75b7f149e4697fba1c25bdf8e7931a559 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn314/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dcn314/Makefile
@@ -10,7 +10,7 @@
 #
 # Makefile for dcn314.
 
-DCN314 = dcn314_dio_stream_encoder.o dcn314_dccg.o
+DCN314 = dcn314_dio_stream_encoder.o
 
 AMD_DAL_DCN314 = $(addprefix $(AMDDALPATH)/dc/dcn314/,$(DCN314))
 

diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/Makefile b/drivers/gpu/drm/amd/display/dc/dcn32/Makefile
index 8a6bc529f376e8cac37771851378b6bf04a5458c..dd3c4e70bce6aff9360acb0f9f8a910d5d56b8eb 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn32/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dcn32/Makefile
@@ -10,8 +10,7 @@
 #
 # Makefile for dcn32.
 
-DCN32 = dcn32_dccg.o \
-               dcn32_mmhubbub.o dcn32_hubp.o dcn32_mpc.o \
+DCN32 = dcn32_mmhubbub.o dcn32_hubp.o dcn32_mpc.o \
                dcn32_dio_stream_encoder.o dcn32_dio_link_encoder.o dcn32_resource_helpers.o \
                dcn32_hpo_dp_link_encoder.o
 

diff --git a/drivers/gpu/drm/amd/display/dc/dcn35/Makefile b/drivers/gpu/drm/amd/display/dc/dcn35/Makefile
index 09fd994ae1583a6b81445cd685aad81e5faedcfb..eb70d5f4e90e2e129514d5a45679044737a62c3e 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn35/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dcn35/Makefile
@@ -11,7 +11,7 @@
 # Makefile for DCN35.
 
 DCN35 = dcn35_dio_stream_encoder.o \
-       dcn35_dio_link_encoder.o dcn35_dccg.o \
+       dcn35_dio_link_encoder.o \
        dcn35_hubp.o \
        dcn35_mmhubbub.o dcn35_opp.o dcn35_pg_cntl.o dcn35_dwb.o