Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amd/display: move link_hwss to link folder and break down to files

[why]
Move link_hwss to its own folder as part of DC LIB and break it down
to separate file one for each type of backend for code isolation.

Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Reviewed-by: Jun Lei <Jun.Lei@amd.com>
Acked-by: Stylon Wang <stylon.wang@amd.com>
Signed-off-by: Wenjing Liu <wenjing.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Wenjing Liu and committed by
Alex Deucher
fd249266 2750caff

+528 -209
+2 -2
drivers/gpu/drm/amd/display/dc/Makefile
··· 23 23 # Makefile for Display Core (dc) component. 24 24 # 25 25 26 - DC_LIBS = basics bios clk_mgr dce dml gpio irq virtual 26 + DC_LIBS = basics bios dml clk_mgr dce gpio irq link virtual 27 27 28 28 ifdef CONFIG_DRM_AMD_DC_DCN 29 29 DC_LIBS += dcn20 ··· 58 58 include $(AMD_DC) 59 59 60 60 DISPLAY_CORE = dc.o dc_stat.o dc_link.o dc_resource.o dc_hw_sequencer.o dc_sink.o \ 61 - dc_surface.o dc_link_hwss.o dc_link_dp.o dc_link_ddc.o dc_debug.o dc_stream.o \ 61 + dc_surface.o dc_link_dp.o dc_link_ddc.o dc_debug.o dc_stream.o \ 62 62 dc_link_enc_cfg.o dc_link_dpia.o dc_link_dpcd.o 63 63 64 64 ifdef CONFIG_DRM_AMD_DC_DCN
+4
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
··· 43 43 #include "dpcd_defs.h" 44 44 #include "link_enc_cfg.h" 45 45 #include "dc_link_dp.h" 46 + #include "virtual/virtual_link_hwss.h" 47 + #include "link/link_hwss_dio.h" 48 + #include "link/link_hwss_dpia.h" 49 + #include "link/link_hwss_hpo_dp.h" 46 50 47 51 #if defined(CONFIG_DRM_AMD_DC_SI) 48 52 #include "dce60/dce60_resource.h"
+1
drivers/gpu/drm/amd/display/dc/inc/core_types.h
··· 54 54 #ifdef CONFIG_DRM_AMD_DC_HDCP 55 55 #include "dm_cp_psp.h" 56 56 #endif 57 + #include "link_hwss.h" 57 58 58 59 /************ link *****************/ 59 60 struct link_init_data {
+30
drivers/gpu/drm/amd/display/dc/link/Makefile
··· 1 + # 2 + # Copyright 2022 Advanced Micro Devices, Inc. 3 + # 4 + # Permission is hereby granted, free of charge, to any person obtaining a 5 + # copy of this software and associated documentation files (the "Software"), 6 + # to deal in the Software without restriction, including without limitation 7 + # the rights to use, copy, modify, merge, publish, distribute, sublicense, 8 + # and/or sell copies of the Software, and to permit persons to whom the 9 + # Software is furnished to do so, subject to the following conditions: 10 + # 11 + # The above copyright notice and this permission notice shall be included in 12 + # all copies or substantial portions of the Software. 13 + # 14 + # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 15 + # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 16 + # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 17 + # THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR 18 + # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 19 + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 20 + # OTHER DEALINGS IN THE SOFTWARE. 21 + # 22 + # Makefile for the link sub-component of DAL. 23 + # It abstracts the control and status of back end pipe such as DIO, HPO, DPIA, 24 + # PHY, HPD, DDC and etc). 25 + 26 + LINK = link_hwss_dio.o link_hwss_dpia.o link_hwss_hpo_dp.o 27 + 28 + AMD_DAL_LINK = $(addprefix $(AMDDALPATH)/dc/link/,$(LINK)) 29 + 30 + AMD_DISPLAY_FILES += $(AMD_DAL_LINK)
+1 -1
drivers/gpu/drm/amd/display/dc/virtual/Makefile
··· 23 23 # Makefile for the virtual sub-component of DAL. 24 24 # It provides the control and status of HW CRTC block. 25 25 26 - VIRTUAL = virtual_link_encoder.o virtual_stream_encoder.o 26 + VIRTUAL = virtual_link_encoder.o virtual_stream_encoder.o virtual_link_hwss.o 27 27 28 28 AMD_DAL_VIRTUAL = $(addprefix $(AMDDALPATH)/dc/virtual/,$(VIRTUAL)) 29 29