drm/amd/display: Move SPL to a new path

[WHY & HOW]
- Move SPL from dc/spl to dc/sspl
- Update build files and header paths
- Remove dc/spl files

Reviewed-by: George Zhang <george.zhang@amd.com>
Signed-off-by: Samson Tam <Samson.Tam@amd.com>
Signed-off-by: Alex Hung <alex.hung@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/dc/Makefile b/drivers/gpu/drm/amd/display/dc/Makefile
index 8992e697759f90a8bfd12d2738daea923ad86a0c..3e1f5b689718e6fe35b45cc31b4854fa2d9a8712 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/Makefile
@@ -52,7 +52,7 @@ endif
 DC_LIBS += hdcp
 
 ifdef CONFIG_DRM_AMD_DC_FP
-DC_LIBS += spl
+DC_LIBS += sspl
 DC_SPL_TRANS += dc_spl_translate.o
 endif
 

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 559446dcd431e9a099341355d99df5e5be5a05e4..9ac299fb10344893a16820e84450aa50fd0b0078 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -46,8 +46,6 @@
 
 #include "dmub/inc/dmub_cmd.h"
 
-#include "spl/dc_spl_types.h"
-
 struct abm_save_restore;
 
 /* forward declaration */

diff --git a/drivers/gpu/drm/amd/display/dc/dc_spl_translate.c b/drivers/gpu/drm/amd/display/dc/dc_spl_translate.c
index 3518eb1b8cd1cda5c2470fb85df032a81a70aaa5..e3a8283b4098c7cbe3c506286f23b5b6b2658255 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_spl_translate.c
+++ b/drivers/gpu/drm/amd/display/dc/dc_spl_translate.c
@@ -3,7 +3,6 @@
 // Copyright 2024 Advanced Micro Devices, Inc.
 
 #include "dc_spl_translate.h"
-#include "spl/dc_spl_types.h"
 #include "dcn20/dcn20_dpp.h"
 #include "dcn32/dcn32_dpp.h"
 #include "dcn401/dcn401_dpp.h"

diff --git a/drivers/gpu/drm/amd/display/dc/dpp/dcn20/dcn20_dpp.h b/drivers/gpu/drm/amd/display/dc/dpp/dcn20/dcn20_dpp.h
index f09cba8e29ccef9153120a1dbed806d0f90e6089..85f359b5da67454c6e153a631d46c7fa3233735b 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dpp/dcn20/dcn20_dpp.h
+++ b/drivers/gpu/drm/amd/display/dc/dpp/dcn20/dcn20_dpp.h
@@ -26,7 +26,6 @@
 #define __DCN20_DPP_H__
 
 #include "dcn10/dcn10_dpp.h"
-#include "spl/dc_spl_types.h"
 #define TO_DCN20_DPP(dpp)\
        container_of(dpp, struct dcn20_dpp, base)
 

diff --git a/drivers/gpu/drm/amd/display/dc/dpp/dcn32/dcn32_dpp.h b/drivers/gpu/drm/amd/display/dc/dpp/dcn32/dcn32_dpp.h
index 992df172378cc614c40bd23a95008253dc6dfb68..f33dddbfcc319b871429318e6730789f3d920daa 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dpp/dcn32/dcn32_dpp.h
+++ b/drivers/gpu/drm/amd/display/dc/dpp/dcn32/dcn32_dpp.h
@@ -27,7 +27,6 @@
 
 #include "dcn20/dcn20_dpp.h"
 #include "dcn30/dcn30_dpp.h"
-#include "spl/dc_spl_types.h"
 
 bool dpp32_construct(struct dcn3_dpp *dpp3,
        struct dc_context *ctx,

diff --git a/drivers/gpu/drm/amd/display/dc/inc/core_types.h b/drivers/gpu/drm/amd/display/dc/inc/core_types.h
index 37632be09e098631dbec710331edd8d89b1cc67e..d0021f25f3d8a7dfd62d9ee7d7c5f6ad71816d3e 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/core_types.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/core_types.h
@@ -39,7 +39,7 @@
 #include "panel_cntl.h"
 #include "dmub/inc/dmub_cmd.h"
 #include "pg_cntl.h"
-#include "spl/dc_spl.h"
+#include "sspl/dc_spl.h"
 
 #define MAX_CLOCK_SOURCES 7
 #define MAX_SVP_PHANTOM_STREAMS 2

diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/transform.h b/drivers/gpu/drm/amd/display/dc/inc/hw/transform.h
index 45262cba675e51716a1c203978438165d5374a32..5a1d9b708a9d97c4e93adcf24c66953ed46554f0 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/transform.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/transform.h
@@ -29,7 +29,7 @@
 #include "hw_shared.h"
 #include "dc_hw_types.h"
 #include "fixed31_32.h"
-#include "spl/dc_spl_types.h"
+#include "sspl/dc_spl_types.h"
 
 #define CSC_TEMPERATURE_MATRIX_SIZE 12
 

diff --git a/drivers/gpu/drm/amd/display/dc/inc/resource.h b/drivers/gpu/drm/amd/display/dc/inc/resource.h
index b32d07ce0f0878f92cb6240c6a9fd05483eff928..042e04f924a2fe24b67de7f660b3d4b5633c9503 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/resource.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/resource.h
@@ -29,7 +29,6 @@
 #include "core_status.h"
 #include "dal_asic_id.h"
 #include "dm_pp_smu.h"
-#include "spl/dc_spl.h"
 
 #define MEMORY_TYPE_MULTIPLIER_CZ 4
 #define MEMORY_TYPE_HBM 2

diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c
index c1ebc6b1c9379079bd936be64b7b7ac90081cdb6..5cb0e0191a16dd1bb6bd3228065af91191d90dac 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c
@@ -76,8 +76,8 @@
 
 #include "dml2/dml2_wrapper.h"
 
-#include "spl/dc_spl_scl_easf_filters.h"
-#include "spl/dc_spl_isharp_filters.h"
+#include "sspl/dc_spl_scl_easf_filters.h"
+#include "sspl/dc_spl_isharp_filters.h"
 
 #define DC_LOGGER_INIT(logger)
 

diff --git a/drivers/gpu/drm/amd/display/dc/spl/Makefile b/drivers/gpu/drm/amd/display/dc/sspl/Makefile
similarity index 96%
rename from drivers/gpu/drm/amd/display/dc/spl/Makefile
rename to drivers/gpu/drm/amd/display/dc/sspl/Makefile
index 5edf3c6cf3e2ddb04d03d7d1f378db59bfa83e67..5e3e4aa138203125568a999626083b194cd4b6c4 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/spl/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/sspl/Makefile
@@ -25,7 +25,7 @@
 
 SPL = dc_spl.o dc_spl_scl_filters.o dc_spl_scl_easf_filters.o dc_spl_isharp_filters.o dc_spl_filters.o spl_fixpt31_32.o spl_custom_float.o
 
-AMD_DAL_SPL = $(addprefix $(AMDDALPATH)/dc/spl/,$(SPL))
+AMD_DAL_SPL = $(addprefix $(AMDDALPATH)/dc/sspl/,$(SPL))
 
 AMD_DISPLAY_FILES += $(AMD_DAL_SPL)
 

diff --git a/drivers/gpu/drm/amd/display/dc/spl/dc_spl.c b/drivers/gpu/drm/amd/display/dc/sspl/dc_spl.c
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/spl/dc_spl.c
rename to drivers/gpu/drm/amd/display/dc/sspl/dc_spl.c

diff --git a/drivers/gpu/drm/amd/display/dc/spl/dc_spl.h b/drivers/gpu/drm/amd/display/dc/sspl/dc_spl.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/spl/dc_spl.h
rename to drivers/gpu/drm/amd/display/dc/sspl/dc_spl.h

diff --git a/drivers/gpu/drm/amd/display/dc/spl/dc_spl_filters.c b/drivers/gpu/drm/amd/display/dc/sspl/dc_spl_filters.c
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/spl/dc_spl_filters.c
rename to drivers/gpu/drm/amd/display/dc/sspl/dc_spl_filters.c

diff --git a/drivers/gpu/drm/amd/display/dc/spl/dc_spl_filters.h b/drivers/gpu/drm/amd/display/dc/sspl/dc_spl_filters.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/spl/dc_spl_filters.h
rename to drivers/gpu/drm/amd/display/dc/sspl/dc_spl_filters.h

diff --git a/drivers/gpu/drm/amd/display/dc/spl/dc_spl_isharp_filters.c b/drivers/gpu/drm/amd/display/dc/sspl/dc_spl_isharp_filters.c
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/spl/dc_spl_isharp_filters.c
rename to drivers/gpu/drm/amd/display/dc/sspl/dc_spl_isharp_filters.c

diff --git a/drivers/gpu/drm/amd/display/dc/spl/dc_spl_isharp_filters.h b/drivers/gpu/drm/amd/display/dc/sspl/dc_spl_isharp_filters.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/spl/dc_spl_isharp_filters.h
rename to drivers/gpu/drm/amd/display/dc/sspl/dc_spl_isharp_filters.h

diff --git a/drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_easf_filters.c b/drivers/gpu/drm/amd/display/dc/sspl/dc_spl_scl_easf_filters.c
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_easf_filters.c
rename to drivers/gpu/drm/amd/display/dc/sspl/dc_spl_scl_easf_filters.c

diff --git a/drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_easf_filters.h b/drivers/gpu/drm/amd/display/dc/sspl/dc_spl_scl_easf_filters.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_easf_filters.h
rename to drivers/gpu/drm/amd/display/dc/sspl/dc_spl_scl_easf_filters.h

diff --git a/drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_filters.c b/drivers/gpu/drm/amd/display/dc/sspl/dc_spl_scl_filters.c
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_filters.c
rename to drivers/gpu/drm/amd/display/dc/sspl/dc_spl_scl_filters.c

diff --git a/drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_filters.h b/drivers/gpu/drm/amd/display/dc/sspl/dc_spl_scl_filters.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_filters.h
rename to drivers/gpu/drm/amd/display/dc/sspl/dc_spl_scl_filters.h

diff --git a/drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h b/drivers/gpu/drm/amd/display/dc/sspl/dc_spl_types.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h
rename to drivers/gpu/drm/amd/display/dc/sspl/dc_spl_types.h

diff --git a/drivers/gpu/drm/amd/display/dc/spl/spl_custom_float.c b/drivers/gpu/drm/amd/display/dc/sspl/spl_custom_float.c
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/spl/spl_custom_float.c
rename to drivers/gpu/drm/amd/display/dc/sspl/spl_custom_float.c

diff --git a/drivers/gpu/drm/amd/display/dc/spl/spl_custom_float.h b/drivers/gpu/drm/amd/display/dc/sspl/spl_custom_float.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/spl/spl_custom_float.h
rename to drivers/gpu/drm/amd/display/dc/sspl/spl_custom_float.h

diff --git a/drivers/gpu/drm/amd/display/dc/spl/spl_debug.h b/drivers/gpu/drm/amd/display/dc/sspl/spl_debug.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/spl/spl_debug.h
rename to drivers/gpu/drm/amd/display/dc/sspl/spl_debug.h

diff --git a/drivers/gpu/drm/amd/display/dc/spl/spl_fixpt31_32.c b/drivers/gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.c
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/spl/spl_fixpt31_32.c
rename to drivers/gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.c

diff --git a/drivers/gpu/drm/amd/display/dc/spl/spl_fixpt31_32.h b/drivers/gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/spl/spl_fixpt31_32.h
rename to drivers/gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.h

diff --git a/drivers/gpu/drm/amd/display/dc/spl/spl_os_types.h b/drivers/gpu/drm/amd/display/dc/sspl/spl_os_types.h
similarity index 100%
rename from drivers/gpu/drm/amd/display/dc/spl/spl_os_types.h
rename to drivers/gpu/drm/amd/display/dc/sspl/spl_os_types.h