drm/amd/display: Refactoring DWB related files from dcn30 Files

[Why] To refactor DWB related files from dcn30 Files [How] Moved DWB related files from dcn30 to specific DWB folder and updated Makefiles to fix Compilation. Reviewed-by: Martin Leung <martin.leung@amd.com> Signed-off-by: Jerry Zuo <jerry.zuo@amd.com> Signed-off-by: Mudimela <lmudimel@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
mariux64 · Jul 23, 2024 · b8d3782 · b8d3782
1 parent 323b19f
commit b8d3782
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 4 deletions.
diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/Makefile b/drivers/gpu/drm/amd/display/dc/dcn30/Makefile
@@ -25,8 +25,6 @@
 
 DCN30 := dcn30_vpg.o \
 	dcn30_afmt.o \
-	dcn30_dwb.o \
-	dcn30_dwb_cm.o \
 	dcn30_cm_common.o \
 	dcn30_mmhubbub.o \
 

diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c
@@ -28,7 +28,7 @@
 #include "reg_helper.h"
 #include "dcn30/dcn30_dpp.h"
 #include "basics/conversion.h"
-#include "dcn30_cm_common.h"
+#include "dcn30/dcn30_cm_common.h"
 #include "custom_float.h"
 
 #define REG(reg) reg

diff --git a/drivers/gpu/drm/amd/display/dc/dwb/Makefile b/drivers/gpu/drm/amd/display/dc/dwb/Makefile
@@ -24,6 +24,15 @@
 #
 
 ifdef CONFIG_DRM_AMD_DC_FP
+###############################################################################
+# DCN30
+###############################################################################
+DWB_DCN30 = dcn30_dwb.o dcn30_dwb_cm.o
+
+AMD_DAL_DWB_DCN30 = $(addprefix $(AMDDALPATH)/dc/dwb/dcn30/,$(DWB_DCN30))
+
+AMD_DISPLAY_FILES += $(AMD_DAL_DWB_DCN30)
+
 ###############################################################################
 # DCN35
 ###############################################################################

diff --git a/...rm/amd/display/dc/dcn30/dcn30_cm_common.h → ...md/display/dc/dwb/dcn30/dcn30_cm_common.h b/...rm/amd/display/dc/dcn30/dcn30_cm_common.h → ...md/display/dc/dwb/dcn30/dcn30_cm_common.h
diff --git a/.../gpu/drm/amd/display/dc/dcn30/dcn30_dwb.c → .../drm/amd/display/dc/dwb/dcn30/dcn30_dwb.c b/.../gpu/drm/amd/display/dc/dcn30/dcn30_dwb.c → .../drm/amd/display/dc/dwb/dcn30/dcn30_dwb.c
diff --git a/.../gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h → .../drm/amd/display/dc/dwb/dcn30/dcn30_dwb.h b/.../gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h → .../drm/amd/display/dc/dwb/dcn30/dcn30_dwb.h
diff --git a/...u/drm/amd/display/dc/dcn30/dcn30_dwb_cm.c → ...m/amd/display/dc/dwb/dcn30/dcn30_dwb_cm.c b/...u/drm/amd/display/dc/dcn30/dcn30_dwb_cm.c → ...m/amd/display/dc/dwb/dcn30/dcn30_dwb_cm.c
diff --git a/drivers/gpu/drm/amd/display/dc/dwb/dcn35/dcn35_dwb.c b/drivers/gpu/drm/amd/display/dc/dwb/dcn35/dcn35_dwb.c
@@ -21,7 +21,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-
 #include "reg_helper.h"
 #include "dcn35_dwb.h"