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

drm/amd/display: Rename header file link.h to link_service.h

[WHY]
Header file name "link.h" collides with system header when dc is
compiled as a user-mode library

[WHAT]
Rename link.h to link_service.h to avoid name collision

Reviewed-by: Alvin Lee <alvin.lee2@amd.com>
Signed-off-by: Wesley Chalmers <Wesley.Chalmers@amd.com>
Signed-off-by: Ray Wu <ray.wu@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Wesley Chalmers and committed by
Alex Deucher
782f0bb5 18e75515

+73 -72
+1 -1
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c
··· 31 31 #include "amdgpu_dm.h" 32 32 #include "modules/power/power_helpers.h" 33 33 #include "dmub/inc/dmub_cmd.h" 34 - #include "dc/inc/link.h" 34 + #include "dc/inc/link_service.h" 35 35 36 36 /* 37 37 * amdgpu_dm_link_supports_replay() - check if the link supports replay
+1 -1
drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
··· 28 28 #include "dccg.h" 29 29 #include "clk_mgr_internal.h" 30 30 #include "dc_state_priv.h" 31 - #include "link.h" 31 + #include "link_service.h" 32 32 33 33 #include "dce100/dce_clk_mgr.h" 34 34 #include "dce110/dce110_clk_mgr.h"
+1 -1
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c
··· 47 47 #include "dcn30/dcn30_clk_mgr.h" 48 48 49 49 #include "dc_dmub_srv.h" 50 - #include "link.h" 50 + #include "link_service.h" 51 51 52 52 #include "logger_types.h" 53 53
+1 -1
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c
··· 48 48 #include "dcn31/dcn31_clk_mgr.h" 49 49 50 50 #include "dc_dmub_srv.h" 51 - #include "link.h" 51 + #include "link_service.h" 52 52 #include "dcn314_smu.h" 53 53 54 54
+1 -1
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c
··· 46 46 #define DC_LOGGER \ 47 47 clk_mgr->base.base.ctx->logger 48 48 49 - #include "link.h" 49 + #include "link_service.h" 50 50 51 51 #define TO_CLK_MGR_DCN315(clk_mgr)\ 52 52 container_of(clk_mgr, struct clk_mgr_dcn315, base)
+1 -1
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c
··· 39 39 #include "dcn316_smu.h" 40 40 #include "dm_helpers.h" 41 41 #include "dc_dmub_srv.h" 42 - #include "link.h" 42 + #include "link_service.h" 43 43 44 44 // DCN316 this is CLK1 instance 45 45 #define MAX_INSTANCE 7
+1 -1
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c
··· 33 33 #include "reg_helper.h" 34 34 #include "core_types.h" 35 35 #include "dm_helpers.h" 36 - #include "link.h" 36 + #include "link_service.h" 37 37 #include "dc_state_priv.h" 38 38 #include "atomfirmware.h" 39 39 #include "dcn32_smu13_driver_if.h"
+1 -1
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c
··· 44 44 #include "dcn31/dcn31_clk_mgr.h" 45 45 46 46 #include "dc_dmub_srv.h" 47 - #include "link.h" 47 + #include "link_service.h" 48 48 #include "logger_types.h" 49 49 50 50 #undef DC_LOGGER
+1 -1
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c
··· 13 13 #include "reg_helper.h" 14 14 #include "core_types.h" 15 15 #include "dm_helpers.h" 16 - #include "link.h" 16 + #include "link_service.h" 17 17 #include "dc_state_priv.h" 18 18 #include "atomfirmware.h" 19 19
+1 -1
drivers/gpu/drm/amd/display/dc/core/dc.c
··· 60 60 #include "link_encoder.h" 61 61 #include "link_enc_cfg.h" 62 62 63 - #include "link.h" 63 + #include "link_service.h" 64 64 #include "dm_helpers.h" 65 65 #include "mem_input.h" 66 66
+1 -1
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
··· 40 40 #include "virtual/virtual_stream_encoder.h" 41 41 #include "dpcd_defs.h" 42 42 #include "link_enc_cfg.h" 43 - #include "link.h" 43 + #include "link_service.h" 44 44 #include "clk_mgr.h" 45 45 #include "dc_state_priv.h" 46 46 #include "dc_stream_priv.h"
+1 -1
drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c
··· 3 3 // Copyright 2024 Advanced Micro Devices, Inc. 4 4 5 5 #include "dc.h" 6 - #include "link.h" 6 + #include "link_service.h" 7 7 #include "dc_dmub_srv.h" 8 8 #include "dmub/dmub_srv.h" 9 9 #include "core_types.h"
+1 -1
drivers/gpu/drm/amd/display/dc/dio/dcn10/dcn10_stream_encoder.c
··· 28 28 #include "dcn10_stream_encoder.h" 29 29 #include "reg_helper.h" 30 30 #include "hw_shared.h" 31 - #include "link.h" 31 + #include "link_service.h" 32 32 #include "dpcd_defs.h" 33 33 #include "dcn30/dcn30_afmt.h" 34 34
+1 -1
drivers/gpu/drm/amd/display/dc/dio/dcn20/dcn20_stream_encoder.c
··· 29 29 #include "dcn20_stream_encoder.h" 30 30 #include "reg_helper.h" 31 31 #include "hw_shared.h" 32 - #include "link.h" 32 + #include "link_service.h" 33 33 #include "dpcd_defs.h" 34 34 35 35 #define DC_LOGGER \
+1 -1
drivers/gpu/drm/amd/display/dc/dio/dcn314/dcn314_dio_stream_encoder.c
··· 30 30 #include "dcn314_dio_stream_encoder.h" 31 31 #include "reg_helper.h" 32 32 #include "hw_shared.h" 33 - #include "link.h" 33 + #include "link_service.h" 34 34 #include "dpcd_defs.h" 35 35 36 36 #define DC_LOGGER \
+1 -1
drivers/gpu/drm/amd/display/dc/dio/dcn32/dcn32_dio_stream_encoder.c
··· 29 29 #include "dcn32_dio_stream_encoder.h" 30 30 #include "reg_helper.h" 31 31 #include "hw_shared.h" 32 - #include "link.h" 32 + #include "link_service.h" 33 33 #include "dpcd_defs.h" 34 34 35 35 #define DC_LOGGER \
+1 -1
drivers/gpu/drm/amd/display/dc/dio/dcn35/dcn35_dio_stream_encoder.c
··· 29 29 #include "dcn35_dio_stream_encoder.h" 30 30 #include "reg_helper.h" 31 31 #include "hw_shared.h" 32 - #include "link.h" 32 + #include "link_service.h" 33 33 #include "dpcd_defs.h" 34 34 35 35 #define DC_LOGGER \
+1 -1
drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_stream_encoder.c
··· 32 32 #include "dcn401_dio_stream_encoder.h" 33 33 #include "reg_helper.h" 34 34 #include "hw_shared.h" 35 - #include "link.h" 35 + #include "link_service.h" 36 36 #include "dpcd_defs.h" 37 37 38 38 #define DC_LOGGER \
+1 -2
drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c
··· 30 30 #include "dcn20/dcn20_resource.h" 31 31 #include "dcn21/dcn21_resource.h" 32 32 #include "clk_mgr/dcn21/rn_clk_mgr.h" 33 - 34 - #include "link.h" 33 + #include "link_service.h" 35 34 #include "dcn20_fpu.h" 36 35 #include "dc_state_priv.h" 37 36
+1 -1
drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c
··· 31 31 // We need this includes for WATERMARKS_* defines 32 32 #include "clk_mgr/dcn32/dcn32_smu13_driver_if.h" 33 33 #include "dcn30/dcn30_resource.h" 34 - #include "link.h" 34 + #include "link_service.h" 35 35 #include "dc_state_priv.h" 36 36 37 37 #define DC_LOGGER_INIT(logger)
+1 -1
drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c
··· 31 31 #include "dml/dcn31/dcn31_fpu.h" 32 32 #include "dml/dml_inline_defs.h" 33 33 34 - #include "link.h" 34 + #include "link_service.h" 35 35 36 36 #define DC_LOGGER_INIT(logger) 37 37
+1 -1
drivers/gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c
··· 10 10 #include "dml/dcn35/dcn35_fpu.h" 11 11 #include "dml/dml_inline_defs.h" 12 12 13 - #include "link.h" 13 + #include "link_service.h" 14 14 15 15 #define DC_LOGGER_INIT(logger) 16 16
+1 -1
drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c
··· 28 28 #include "include/hdcp_msg_types.h" 29 29 #include "include/signal_types.h" 30 30 #include "core_types.h" 31 - #include "link.h" 31 + #include "link_service.h" 32 32 #include "link_hwss.h" 33 33 #include "link/protocols/link_dpcd.h" 34 34
+1 -1
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
··· 48 48 #include "link_encoder.h" 49 49 #include "link_enc_cfg.h" 50 50 #include "link_hwss.h" 51 - #include "link.h" 51 + #include "link_service.h" 52 52 #include "dccg.h" 53 53 #include "clock_source.h" 54 54 #include "clk_mgr.h"
+1 -1
drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
··· 55 55 #include "dce/dmub_hw_lock_mgr.h" 56 56 #include "dc_trace.h" 57 57 #include "dce/dmub_outbox.h" 58 - #include "link.h" 58 + #include "link_service.h" 59 59 #include "dc_state_priv.h" 60 60 61 61 #define DC_LOGGER \
+1 -1
drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c
··· 54 54 #include "dpcd_defs.h" 55 55 #include "inc/link_enc_cfg.h" 56 56 #include "link_hwss.h" 57 - #include "link.h" 57 + #include "link_service.h" 58 58 #include "dc_state_priv.h" 59 59 60 60 #define DC_LOGGER \
+1 -1
drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c
··· 35 35 #include "hw/clk_mgr.h" 36 36 #include "dc_dmub_srv.h" 37 37 #include "abm.h" 38 - #include "link.h" 38 + #include "link_service.h" 39 39 40 40 #define DC_LOGGER_INIT(logger) 41 41
+1 -1
drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c
··· 50 50 #include "dpcd_defs.h" 51 51 #include "dcn20/dcn20_hwseq.h" 52 52 #include "dcn30/dcn30_resource.h" 53 - #include "link.h" 53 + #include "link_service.h" 54 54 #include "dc_state_priv.h" 55 55 56 56
+1 -1
drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c
··· 45 45 #include "link_hwss.h" 46 46 #include "dpcd_defs.h" 47 47 #include "dce/dmub_outbox.h" 48 - #include "link.h" 48 + #include "link_service.h" 49 49 #include "dcn10/dcn10_hwseq.h" 50 50 #include "dcn21/dcn21_hwseq.h" 51 51 #include "inc/link_enc_cfg.h"
+1 -1
drivers/gpu/drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c
··· 46 46 #include "link_hwss.h" 47 47 #include "dpcd_defs.h" 48 48 #include "dce/dmub_outbox.h" 49 - #include "link.h" 49 + #include "link_service.h" 50 50 #include "dcn10/dcn10_hwseq.h" 51 51 #include "inc/link_enc_cfg.h" 52 52 #include "dcn30/dcn30_vpg.h"
+1 -1
drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c
··· 49 49 #include "dcn20/dcn20_optc.h" 50 50 #include "dce/dmub_hw_lock_mgr.h" 51 51 #include "dcn32/dcn32_resource.h" 52 - #include "link.h" 52 + #include "link_service.h" 53 53 #include "../dcn20/dcn20_hwseq.h" 54 54 #include "dc_state_priv.h" 55 55
+1 -1
drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c
··· 46 46 #include "link_hwss.h" 47 47 #include "dpcd_defs.h" 48 48 #include "dce/dmub_outbox.h" 49 - #include "link.h" 49 + #include "link_service.h" 50 50 #include "dcn10/dcn10_hwseq.h" 51 51 #include "inc/link_enc_cfg.h" 52 52 #include "dcn30/dcn30_vpg.h"
+1 -1
drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c
··· 25 25 #include "dpcd_defs.h" 26 26 #include "clk_mgr.h" 27 27 #include "dsc.h" 28 - #include "link.h" 28 + #include "link_service.h" 29 29 30 30 #include "dce/dmub_hw_lock_mgr.h" 31 31 #include "dcn10/dcn10_cm_common.h"
+1 -1
drivers/gpu/drm/amd/display/dc/resource/dce120/dce120_resource.c
··· 67 67 #include "reg_helper.h" 68 68 69 69 #include "dce100/dce100_resource.h" 70 - #include "link.h" 70 + #include "link_service.h" 71 71 72 72 #ifndef mmDP0_DP_DPHY_INTERNAL_CTRL 73 73 #define mmDP0_DP_DPHY_INTERNAL_CTRL 0x210f
+1 -1
drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c
··· 85 85 #include "vm_helper.h" 86 86 87 87 #include "link_enc_cfg.h" 88 - #include "link.h" 88 + #include "link_service.h" 89 89 90 90 #define DC_LOGGER_INIT(logger) 91 91
+1 -1
drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.c
··· 60 60 #include "dml/display_mode_vba.h" 61 61 #include "dcn30/dcn30_dccg.h" 62 62 #include "dcn10/dcn10_resource.h" 63 - #include "link.h" 63 + #include "link_service.h" 64 64 #include "dce/dce_panel_cntl.h" 65 65 66 66 #include "dcn30/dcn30_dwb.h"
+2 -1
drivers/gpu/drm/amd/display/dc/resource/dcn302/dcn302_resource.c
··· 47 47 48 48 #include "dcn10/dcn10_resource.h" 49 49 50 - #include "link.h" 50 + #include "link_service.h" 51 + 51 52 #include "dce/dce_abm.h" 52 53 #include "dce/dce_audio.h" 53 54 #include "dce/dce_aux.h"
+1 -1
drivers/gpu/drm/amd/display/dc/resource/dcn303/dcn303_resource.c
··· 47 47 48 48 #include "dcn10/dcn10_resource.h" 49 49 50 - #include "link.h" 50 + #include "link_service.h" 51 51 52 52 #include "dce/dce_abm.h" 53 53 #include "dce/dce_audio.h"
+1 -1
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
··· 69 69 #include "dml/display_mode_vba.h" 70 70 #include "dcn32/dcn32_dccg.h" 71 71 #include "dcn10/dcn10_resource.h" 72 - #include "link.h" 72 + #include "link_service.h" 73 73 #include "dcn31/dcn31_panel_cntl.h" 74 74 75 75 #include "dcn30/dcn30_dwb.h"
+1 -1
drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c
··· 72 72 #include "dml/display_mode_vba.h" 73 73 #include "dcn32/dcn32_dccg.h" 74 74 #include "dcn10/dcn10_resource.h" 75 - #include "link.h" 75 + #include "link_service.h" 76 76 #include "dcn31/dcn31_panel_cntl.h" 77 77 78 78 #include "dcn30/dcn30_dwb.h"
+1 -1
drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c
··· 61 61 #include "dcn31/dcn31_hpo_dp_stream_encoder.h" 62 62 #include "dcn31/dcn31_hpo_dp_link_encoder.h" 63 63 #include "dcn32/dcn32_hpo_dp_link_encoder.h" 64 - #include "link.h" 64 + #include "link_service.h" 65 65 #include "dcn31/dcn31_apg.h" 66 66 #include "dcn32/dcn32_dio_link_encoder.h" 67 67 #include "dcn31/dcn31_vpg.h"
+1 -1
drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c
··· 40 40 #include "dcn31/dcn31_hpo_dp_stream_encoder.h" 41 41 #include "dcn31/dcn31_hpo_dp_link_encoder.h" 42 42 #include "dcn32/dcn32_hpo_dp_link_encoder.h" 43 - #include "link.h" 43 + #include "link_service.h" 44 44 #include "dcn31/dcn31_apg.h" 45 45 #include "dcn32/dcn32_dio_link_encoder.h" 46 46 #include "dcn31/dcn31_vpg.h"
+1 -1
drivers/gpu/drm/amd/display/dc/resource/dcn36/dcn36_resource.c
··· 40 40 #include "dcn31/dcn31_hpo_dp_stream_encoder.h" 41 41 #include "dcn31/dcn31_hpo_dp_link_encoder.h" 42 42 #include "dcn32/dcn32_hpo_dp_link_encoder.h" 43 - #include "link.h" 43 + #include "link_service.h" 44 44 #include "dcn31/dcn31_apg.h" 45 45 #include "dcn32/dcn32_dio_link_encoder.h" 46 46 #include "dcn31/dcn31_vpg.h"
+1 -1
drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c
··· 50 50 #include "dml/display_mode_vba.h" 51 51 #include "dcn401/dcn401_dccg.h" 52 52 #include "dcn10/dcn10_resource.h" 53 - #include "link.h" 53 + #include "link_service.h" 54 54 #include "link_enc_cfg.h" 55 55 #include "dcn31/dcn31_panel_cntl.h" 56 56