drm/amd/display: Refactor virtual directory reorganize encoder and hwss files.
authorBhuvanachandra Pinninti <bpinnint@amd.com>
Wed, 21 Jan 2026 10:35:00 +0000 (16:05 +0530)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 12 Feb 2026 20:08:49 +0000 (15:08 -0500)
[why]
Virtual encoders & hwss were grouped in a separate directory,
not aligned with dio and link component structure.

[how]
Moved virtual_link_encoder and virtual_stream_encoder to dc/dio/virtual/.
Moved virtual_link_hwss to dc/link/hwss/ and renamed to link_hwss_virtual.
Removed dc/virtual/ directory.
Updated all includes and build files (Makefiles)

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Bhuvanachandra Pinninti <bpinnint@amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
36 files changed:
drivers/gpu/drm/amd/display/dc/Makefile
drivers/gpu/drm/amd/display/dc/core/dc.c
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
drivers/gpu/drm/amd/display/dc/dio/Makefile
drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_link_encoder.c [new file with mode: 0644]
drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_link_encoder.h [new file with mode: 0644]
drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_stream_encoder.c [new file with mode: 0644]
drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_stream_encoder.h [new file with mode: 0644]
drivers/gpu/drm/amd/display/dc/link/Makefile
drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_virtual.c [new file with mode: 0644]
drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_virtual.h [new file with mode: 0644]
drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c
drivers/gpu/drm/amd/display/dc/resource/dce120/dce120_resource.c
drivers/gpu/drm/amd/display/dc/resource/dcn10/dcn10_resource.c
drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c
drivers/gpu/drm/amd/display/dc/resource/dcn201/dcn201_resource.c
drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c
drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.c
drivers/gpu/drm/amd/display/dc/resource/dcn301/dcn301_resource.c
drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c
drivers/gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.c
drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c
drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c
drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c
drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c
drivers/gpu/drm/amd/display/dc/resource/dcn36/dcn36_resource.c
drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c
drivers/gpu/drm/amd/display/dc/virtual/Makefile [deleted file]
drivers/gpu/drm/amd/display/dc/virtual/virtual_link_encoder.c [deleted file]
drivers/gpu/drm/amd/display/dc/virtual/virtual_link_encoder.h [deleted file]
drivers/gpu/drm/amd/display/dc/virtual/virtual_link_hwss.c [deleted file]
drivers/gpu/drm/amd/display/dc/virtual/virtual_link_hwss.h [deleted file]
drivers/gpu/drm/amd/display/dc/virtual/virtual_stream_encoder.c [deleted file]
drivers/gpu/drm/amd/display/dc/virtual/virtual_stream_encoder.h [deleted file]

index 7277ed2..93d0295 100644 (file)
@@ -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 dccg hubp dio dwb hpo mmhubbub mpc opp pg
+DC_LIBS = basics bios dml clk_mgr dce gpio hwss irq link dsc resource optc dpp hubbub dccg hubp dio dwb hpo mmhubbub mpc opp pg
 
 ifdef CONFIG_DRM_AMD_DC_FP
 
index e7d2b86..17ba7af 100644 (file)
@@ -53,7 +53,7 @@
 #include "dpp.h"
 #include "timing_generator.h"
 #include "abm.h"
-#include "virtual/virtual_link_encoder.h"
+#include "dio/virtual/virtual_link_encoder.h"
 #include "hubp.h"
 
 #include "link_hwss.h"
index b4e5a79..6398312 100644 (file)
@@ -37,7 +37,7 @@
 #include "dpp.h"
 #include "core_types.h"
 #include "set_mode_types.h"
-#include "virtual/virtual_stream_encoder.h"
+#include "dio/virtual/virtual_stream_encoder.h"
 #include "dpcd_defs.h"
 #include "link_enc_cfg.h"
 #include "link_service.h"
@@ -45,7 +45,7 @@
 #include "dc_state_priv.h"
 #include "dc_stream_priv.h"
 
-#include "virtual/virtual_link_hwss.h"
+#include "link/hwss/link_hwss_virtual.h"
 #include "link/hwss/link_hwss_dio.h"
 #include "link/hwss/link_hwss_dpia.h"
 #include "link/hwss/link_hwss_hpo_dp.h"
index 02eec03..2f56190 100644 (file)
 #
 #
 
+###############################################################################
+# VIRTUAL
+###############################################################################
+DIO_VIRTUAL = virtual_link_encoder.o virtual_stream_encoder.o
+
+AMD_DAL_DIO_VIRTUAL = $(addprefix $(AMDDALPATH)/dc/dio/virtual/,$(DIO_VIRTUAL))
+
+AMD_DISPLAY_FILES += $(AMD_DAL_DIO_VIRTUAL)
+
 ifdef CONFIG_DRM_AMD_DC_FP
 ###############################################################################
 # DCN10
diff --git a/drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_link_encoder.c
new file mode 100644 (file)
index 0000000..2655bc1
--- /dev/null
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2012-15 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.
+ *
+ * Authors: AMD
+ *
+ */
+
+#include "dm_services.h"
+#include "dm_services_types.h"
+
+#include "virtual_link_encoder.h"
+
+static bool virtual_link_encoder_validate_output_with_stream(
+       struct link_encoder *enc,
+       const struct dc_stream_state *stream) { return true; }
+
+static void virtual_link_encoder_hw_init(struct link_encoder *enc) {}
+
+static void virtual_link_encoder_setup(
+       struct link_encoder *enc,
+       enum signal_type signal) {}
+
+static void virtual_link_encoder_enable_tmds_output(
+       struct link_encoder *enc,
+       enum clock_source_id clock_source,
+       enum dc_color_depth color_depth,
+       enum signal_type signal,
+       uint32_t pixel_clock) {}
+
+static void virtual_link_encoder_enable_dp_output(
+       struct link_encoder *enc,
+       const struct dc_link_settings *link_settings,
+       enum clock_source_id clock_source) {}
+
+static void virtual_link_encoder_enable_dp_mst_output(
+       struct link_encoder *enc,
+       const struct dc_link_settings *link_settings,
+       enum clock_source_id clock_source) {}
+
+static void virtual_link_encoder_disable_output(
+       struct link_encoder *link_enc,
+       enum signal_type signal) {}
+
+static void virtual_link_encoder_dp_set_lane_settings(
+       struct link_encoder *enc,
+       const struct dc_link_settings *link_settings,
+       const struct dc_lane_settings lane_settings[LANE_COUNT_DP_MAX]) {}
+
+static void virtual_link_encoder_dp_set_phy_pattern(
+       struct link_encoder *enc,
+       const struct encoder_set_dp_phy_pattern_param *param) {}
+
+static void virtual_link_encoder_update_mst_stream_allocation_table(
+       struct link_encoder *enc,
+       const struct link_mst_stream_allocation_table *table) {}
+
+static void virtual_link_encoder_connect_dig_be_to_fe(
+       struct link_encoder *enc,
+       enum engine_id engine,
+       bool connect) {}
+
+static void virtual_link_encoder_destroy(struct link_encoder **enc)
+{
+       kfree(*enc);
+       *enc = NULL;
+}
+
+static void virtual_link_encoder_get_max_link_cap(struct link_encoder *enc,
+               struct dc_link_settings *link_settings)
+{
+       /* Set Default link settings */
+       struct dc_link_settings max_link_cap = {LANE_COUNT_FOUR, LINK_RATE_HIGH,
+                               LINK_SPREAD_05_DOWNSPREAD_30KHZ, false, 0};
+       *link_settings = max_link_cap;
+}
+
+static const struct link_encoder_funcs virtual_lnk_enc_funcs = {
+       .validate_output_with_stream =
+               virtual_link_encoder_validate_output_with_stream,
+       .hw_init = virtual_link_encoder_hw_init,
+       .setup = virtual_link_encoder_setup,
+       .enable_tmds_output = virtual_link_encoder_enable_tmds_output,
+       .enable_dp_output = virtual_link_encoder_enable_dp_output,
+       .enable_dp_mst_output = virtual_link_encoder_enable_dp_mst_output,
+       .disable_output = virtual_link_encoder_disable_output,
+       .get_max_link_cap = virtual_link_encoder_get_max_link_cap,
+       .dp_set_lane_settings = virtual_link_encoder_dp_set_lane_settings,
+       .dp_set_phy_pattern = virtual_link_encoder_dp_set_phy_pattern,
+       .update_mst_stream_allocation_table =
+               virtual_link_encoder_update_mst_stream_allocation_table,
+       .connect_dig_be_to_fe = virtual_link_encoder_connect_dig_be_to_fe,
+       .destroy = virtual_link_encoder_destroy
+};
+
+bool virtual_link_encoder_construct(
+       struct link_encoder *enc, const struct encoder_init_data *init_data)
+{
+       enc->funcs = &virtual_lnk_enc_funcs;
+       enc->ctx = init_data->ctx;
+       enc->id = init_data->encoder;
+
+       enc->hpd_source = init_data->hpd_source;
+       enc->connector = init_data->connector;
+
+       enc->transmitter = init_data->transmitter;
+
+       enc->output_signals = SIGNAL_TYPE_VIRTUAL;
+
+       enc->preferred_engine = ENGINE_ID_VIRTUAL;
+
+       return true;
+}
diff --git a/drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_link_encoder.h b/drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_link_encoder.h
new file mode 100644 (file)
index 0000000..eb1a94f
--- /dev/null
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2012-15 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.
+ *
+ * Authors: AMD
+ *
+ */
+
+#ifndef __DC_VIRTUAL_LINK_ENCODER_H__
+#define __DC_VIRTUAL_LINK_ENCODER_H__
+
+#include "link_encoder.h"
+
+bool virtual_link_encoder_construct(
+       struct link_encoder *enc, const struct encoder_init_data *init_data);
+
+#endif /* __DC_VIRTUAL_LINK_ENCODER_H__ */
diff --git a/drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_stream_encoder.c
new file mode 100644 (file)
index 0000000..c5d2e94
--- /dev/null
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2012-15 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.
+ *
+ * Authors: AMD
+ *
+ */
+
+#include "dm_services.h"
+#include "virtual_stream_encoder.h"
+
+static void virtual_stream_encoder_dp_set_stream_attribute(
+       struct stream_encoder *enc,
+       struct dc_crtc_timing *crtc_timing,
+       enum dc_color_space output_color_space,
+       bool use_vsc_sdp_for_colorimetry,
+       uint32_t enable_sdp_splitting) {}
+
+static void virtual_stream_encoder_hdmi_set_stream_attribute(
+       struct stream_encoder *enc,
+       struct dc_crtc_timing *crtc_timing,
+       int actual_pix_clk_khz,
+       bool enable_audio) {}
+
+static void virtual_stream_encoder_dvi_set_stream_attribute(
+       struct stream_encoder *enc,
+       struct dc_crtc_timing *crtc_timing,
+       bool is_dual_link) {}
+
+static void virtual_stream_encoder_set_throttled_vcp_size(
+       struct stream_encoder *enc,
+       struct fixed31_32 avg_time_slots_per_mtp)
+{}
+
+static void virtual_stream_encoder_update_hdmi_info_packets(
+       struct stream_encoder *enc,
+       const struct encoder_info_frame *info_frame) {}
+
+static void virtual_stream_encoder_stop_hdmi_info_packets(
+       struct stream_encoder *enc) {}
+
+static void virtual_stream_encoder_set_avmute(
+       struct stream_encoder *enc,
+       bool enable) {}
+static void virtual_stream_encoder_update_dp_info_packets(
+       struct stream_encoder *enc,
+       const struct encoder_info_frame *info_frame) {}
+
+static void virtual_stream_encoder_stop_dp_info_packets(
+       struct stream_encoder *enc) {}
+
+static void virtual_stream_encoder_dp_blank(
+       struct dc_link *link,
+       struct stream_encoder *enc) {}
+
+static void virtual_stream_encoder_dp_unblank(
+       struct dc_link *link,
+       struct stream_encoder *enc,
+       const struct encoder_unblank_param *param) {}
+
+static void virtual_audio_mute_control(
+       struct stream_encoder *enc,
+       bool mute) {}
+
+static void virtual_stream_encoder_reset_hdmi_stream_attribute(
+               struct stream_encoder *enc)
+{}
+
+static void virtual_enc_dp_set_odm_combine(
+       struct stream_encoder *enc,
+       bool odm_combine)
+{}
+
+static void virtual_dig_connect_to_otg(
+               struct stream_encoder *enc,
+               int tg_inst)
+{}
+
+static void virtual_setup_stereo_sync(
+                       struct stream_encoder *enc,
+                       int tg_inst,
+                       bool enable)
+{}
+
+static void virtual_stream_encoder_set_dsc_pps_info_packet(
+               struct stream_encoder *enc,
+               bool enable,
+               uint8_t *dsc_packed_pps,
+               bool immediate_update)
+{}
+
+static const struct stream_encoder_funcs virtual_str_enc_funcs = {
+       .dp_set_odm_combine =
+               virtual_enc_dp_set_odm_combine,
+       .dp_set_stream_attribute =
+               virtual_stream_encoder_dp_set_stream_attribute,
+       .hdmi_set_stream_attribute =
+               virtual_stream_encoder_hdmi_set_stream_attribute,
+       .dvi_set_stream_attribute =
+               virtual_stream_encoder_dvi_set_stream_attribute,
+       .set_throttled_vcp_size =
+               virtual_stream_encoder_set_throttled_vcp_size,
+       .update_hdmi_info_packets =
+               virtual_stream_encoder_update_hdmi_info_packets,
+       .stop_hdmi_info_packets =
+               virtual_stream_encoder_stop_hdmi_info_packets,
+       .update_dp_info_packets =
+               virtual_stream_encoder_update_dp_info_packets,
+       .stop_dp_info_packets =
+               virtual_stream_encoder_stop_dp_info_packets,
+       .dp_blank =
+               virtual_stream_encoder_dp_blank,
+       .dp_unblank =
+               virtual_stream_encoder_dp_unblank,
+
+       .audio_mute_control = virtual_audio_mute_control,
+       .set_avmute = virtual_stream_encoder_set_avmute,
+       .hdmi_reset_stream_attribute = virtual_stream_encoder_reset_hdmi_stream_attribute,
+       .dig_connect_to_otg = virtual_dig_connect_to_otg,
+       .setup_stereo_sync = virtual_setup_stereo_sync,
+       .dp_set_dsc_pps_info_packet = virtual_stream_encoder_set_dsc_pps_info_packet,
+};
+
+bool virtual_stream_encoder_construct(
+       struct stream_encoder *enc,
+       struct dc_context *ctx,
+       struct dc_bios *bp)
+{
+       if (!enc)
+               return false;
+       if (!bp)
+               return false;
+
+       enc->funcs = &virtual_str_enc_funcs;
+       enc->ctx = ctx;
+       enc->id = ENGINE_ID_VIRTUAL;
+       enc->bp = bp;
+
+       return true;
+}
+
+struct stream_encoder *virtual_stream_encoder_create(
+       struct dc_context *ctx, struct dc_bios *bp)
+{
+       struct stream_encoder *enc = kzalloc(sizeof(*enc), GFP_KERNEL);
+
+       if (!enc)
+               return NULL;
+
+       if (virtual_stream_encoder_construct(enc, ctx, bp))
+               return enc;
+
+       BREAK_TO_DEBUGGER();
+       kfree(enc);
+       return NULL;
+}
diff --git a/drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_stream_encoder.h b/drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_stream_encoder.h
new file mode 100644 (file)
index 0000000..bf3422c
--- /dev/null
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2012-15 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.
+ *
+ * Authors: AMD
+ *
+ */
+
+#ifndef __DC_VIRTUAL_STREAM_ENCODER_H__
+#define __DC_VIRTUAL_STREAM_ENCODER_H__
+
+#include "stream_encoder.h"
+
+struct stream_encoder *virtual_stream_encoder_create(
+       struct dc_context *ctx, struct dc_bios *bp);
+
+bool virtual_stream_encoder_construct(
+       struct stream_encoder *enc,
+       struct dc_context *ctx,
+       struct dc_bios *bp);
+
+#endif /* __DC_VIRTUAL_STREAM_ENCODER_H__ */
index 84dace2..0f3670e 100644 (file)
@@ -43,7 +43,8 @@ AMD_DISPLAY_FILES += $(AMD_DAL_LINK_ACCESSORIES)
 # hwss
 ###############################################################################
 LINK_HWSS = link_hwss_dio.o link_hwss_dpia.o link_hwss_hpo_dp.o \
-link_hwss_dio_fixed_vs_pe_retimer.o link_hwss_hpo_fixed_vs_pe_retimer_dp.o
+link_hwss_dio_fixed_vs_pe_retimer.o link_hwss_hpo_fixed_vs_pe_retimer_dp.o \
+link_hwss_virtual.o
 
 AMD_DAL_LINK_HWSS = $(addprefix $(AMDDALPATH)/dc/link/hwss/, \
 $(LINK_HWSS))
diff --git a/drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_virtual.c b/drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_virtual.c
new file mode 100644 (file)
index 0000000..64742c2
--- /dev/null
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ *
+ * Authors: AMD
+ *
+ */
+
+#include "link_hwss_virtual.h"
+
+void virtual_setup_stream_encoder(struct pipe_ctx *pipe_ctx)
+{
+}
+
+void virtual_setup_stream_attribute(struct pipe_ctx *pipe_ctx)
+{
+}
+
+void virtual_reset_stream_encoder(struct pipe_ctx *pipe_ctx)
+{
+}
+
+static void virtual_disable_link_output(struct dc_link *link,
+       const struct link_resource *link_res,
+       enum signal_type signal)
+{
+}
+
+static const struct link_hwss virtual_link_hwss = {
+       .setup_stream_encoder = virtual_setup_stream_encoder,
+       .reset_stream_encoder = virtual_reset_stream_encoder,
+       .setup_stream_attribute = virtual_setup_stream_attribute,
+       .disable_link_output = virtual_disable_link_output,
+};
+
+const struct link_hwss *get_virtual_link_hwss(void)
+{
+       return &virtual_link_hwss;
+}
diff --git a/drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_virtual.h b/drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_virtual.h
new file mode 100644 (file)
index 0000000..f6e448c
--- /dev/null
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ *
+ * Authors: AMD
+ *
+ */
+#ifndef __DC_LINK_HWSS_VIRTUAL_H__
+#define __DC_LINK_HWSS_VIRTUAL_H__
+
+#include "core_types.h"
+
+void virtual_setup_stream_encoder(struct pipe_ctx *pipe_ctx);
+void virtual_setup_stream_attribute(struct pipe_ctx *pipe_ctx);
+void virtual_reset_stream_encoder(struct pipe_ctx *pipe_ctx);
+const struct link_hwss *get_virtual_link_hwss(void);
+
+#endif /* __DC_LINK_HWSS_VIRTUAL_H__ */
index d40d91e..a929e64 100644 (file)
@@ -31,7 +31,7 @@
 #include "resource.h"
 #include "clk_mgr.h"
 #include "include/irq_service_interface.h"
-#include "virtual/virtual_stream_encoder.h"
+#include "dio/virtual/virtual_stream_encoder.h"
 #include "dce110/dce110_resource.h"
 #include "dce110/dce110_timing_generator.h"
 #include "irq/dce110/irq_service_dce110.h"
index b1570b6..9289078 100644 (file)
@@ -35,7 +35,7 @@
 #include "dce112/dce112_resource.h"
 
 #include "dce110/dce110_resource.h"
-#include "virtual/virtual_stream_encoder.h"
+#include "dio/virtual/virtual_stream_encoder.h"
 #include "dce120/dce120_timing_generator.h"
 #include "irq/dce120/irq_service_dce120.h"
 #include "dce/dce_opp.h"
index f12367a..476780a 100644 (file)
@@ -48,7 +48,7 @@
 #include "dce/dce_clock_source.h"
 #include "dce/dce_audio.h"
 #include "dce/dce_hwseq.h"
-#include "virtual/virtual_stream_encoder.h"
+#include "dio/virtual/virtual_stream_encoder.h"
 #include "dce110/dce110_resource.h"
 #include "dce112/dce112_resource.h"
 #include "dcn10/dcn10_hubp.h"
index 46985eb..6731544 100644 (file)
@@ -55,7 +55,7 @@
 #include "dce/dce_clock_source.h"
 #include "dce/dce_audio.h"
 #include "dce/dce_hwseq.h"
-#include "virtual/virtual_stream_encoder.h"
+#include "dio/virtual/virtual_stream_encoder.h"
 #include "dce110/dce110_resource.h"
 #include "dml/display_mode_vba.h"
 #include "dcn20/dcn20_dccg.h"
index 0551078..90d3863 100644 (file)
@@ -51,7 +51,7 @@
 #include "dce/dce_clock_source.h"
 #include "dce/dce_audio.h"
 #include "dce/dce_hwseq.h"
-#include "virtual/virtual_stream_encoder.h"
+#include "dio/virtual/virtual_stream_encoder.h"
 #include "dce110/dce110_resource.h"
 #include "dce/dce_aux.h"
 #include "dce/dce_i2c.h"
index 967e813..1076125 100644 (file)
@@ -57,7 +57,7 @@
 #include "dce/dce_clock_source.h"
 #include "dce/dce_audio.h"
 #include "dce/dce_hwseq.h"
-#include "virtual/virtual_stream_encoder.h"
+#include "dio/virtual/virtual_stream_encoder.h"
 #include "dml/display_mode_vba.h"
 #include "dcn20/dcn20_dccg.h"
 #include "dcn21/dcn21_dccg.h"
index d0ebb73..6cfdc37 100644 (file)
@@ -55,7 +55,7 @@
 #include "dce/dce_audio.h"
 #include "dce/dce_hwseq.h"
 #include "clk_mgr.h"
-#include "virtual/virtual_stream_encoder.h"
+#include "dio/virtual/virtual_stream_encoder.h"
 #include "dce110/dce110_resource.h"
 #include "dml/display_mode_vba.h"
 #include "dcn30/dcn30_dccg.h"
index 3ad6a3d..e1d0c16 100644 (file)
@@ -54,7 +54,7 @@
 #include "dce/dce_audio.h"
 #include "dce/dce_hwseq.h"
 #include "clk_mgr.h"
-#include "virtual/virtual_stream_encoder.h"
+#include "dio/virtual/virtual_stream_encoder.h"
 #include "dce110/dce110_resource.h"
 #include "dml/display_mode_vba.h"
 #include "dcn301/dcn301_dccg.h"
index e853ea1..8ad7255 100644 (file)
@@ -64,7 +64,7 @@
 #include "dce/dce_audio.h"
 #include "dce/dce_hwseq.h"
 #include "clk_mgr.h"
-#include "virtual/virtual_stream_encoder.h"
+#include "dio/virtual/virtual_stream_encoder.h"
 #include "dce110/dce110_resource.h"
 #include "dml/display_mode_vba.h"
 #include "dml/dcn31/dcn31_fpu.h"
index 3ccde75..5f0fe6e 100644 (file)
@@ -66,7 +66,7 @@
 #include "dce/dce_audio.h"
 #include "dce/dce_hwseq.h"
 #include "clk_mgr.h"
-#include "virtual/virtual_stream_encoder.h"
+#include "dio/virtual/virtual_stream_encoder.h"
 #include "dce110/dce110_resource.h"
 #include "dml/display_mode_vba.h"
 #include "dml/dcn31/dcn31_fpu.h"
index 4e962f5..a8283f2 100644 (file)
@@ -63,7 +63,7 @@
 #include "dce/dce_audio.h"
 #include "dce/dce_hwseq.h"
 #include "clk_mgr.h"
-#include "virtual/virtual_stream_encoder.h"
+#include "dio/virtual/virtual_stream_encoder.h"
 #include "dce110/dce110_resource.h"
 #include "dml/display_mode_vba.h"
 #include "dml/dcn31/dcn31_fpu.h"
index 5a95dd5..4da0e93 100644 (file)
@@ -63,7 +63,7 @@
 #include "dce/dce_audio.h"
 #include "dce/dce_hwseq.h"
 #include "clk_mgr.h"
-#include "virtual/virtual_stream_encoder.h"
+#include "dio/virtual/virtual_stream_encoder.h"
 #include "dce110/dce110_resource.h"
 #include "dml/display_mode_vba.h"
 #include "dml/dcn31/dcn31_fpu.h"
index b276fec..d3b92c6 100644 (file)
@@ -65,7 +65,7 @@
 #include "dce/dce_audio.h"
 #include "dce/dce_hwseq.h"
 #include "clk_mgr.h"
-#include "virtual/virtual_stream_encoder.h"
+#include "dio/virtual/virtual_stream_encoder.h"
 #include "dml/display_mode_vba.h"
 #include "dcn32/dcn32_dccg.h"
 #include "dcn10/dcn10_resource.h"
index 3466ca3..d08691e 100644 (file)
@@ -68,7 +68,7 @@
 #include "dce/dce_audio.h"
 #include "dce/dce_hwseq.h"
 #include "clk_mgr.h"
-#include "virtual/virtual_stream_encoder.h"
+#include "dio/virtual/virtual_stream_encoder.h"
 #include "dml/display_mode_vba.h"
 #include "dcn32/dcn32_dccg.h"
 #include "dcn10/dcn10_resource.h"
index 45454a0..945da8c 100644 (file)
@@ -70,7 +70,7 @@
 #include "dce/dce_audio.h"
 #include "dce/dce_hwseq.h"
 #include "clk_mgr.h"
-#include "virtual/virtual_stream_encoder.h"
+#include "dio/virtual/virtual_stream_encoder.h"
 #include "dce110/dce110_resource.h"
 #include "dml/display_mode_vba.h"
 #include "dcn35/dcn35_dccg.h"
index e3c5871..e660889 100644 (file)
@@ -49,7 +49,7 @@
 #include "dce/dce_audio.h"
 #include "dce/dce_hwseq.h"
 #include "clk_mgr.h"
-#include "virtual/virtual_stream_encoder.h"
+#include "dio/virtual/virtual_stream_encoder.h"
 #include "dce110/dce110_resource.h"
 #include "dml/display_mode_vba.h"
 #include "dcn35/dcn35_dccg.h"
index 1d8ca31..7582217 100644 (file)
@@ -49,7 +49,7 @@
 #include "dce/dce_audio.h"
 #include "dce/dce_hwseq.h"
 #include "clk_mgr.h"
-#include "virtual/virtual_stream_encoder.h"
+#include "dio/virtual/virtual_stream_encoder.h"
 #include "dce110/dce110_resource.h"
 #include "dml/display_mode_vba.h"
 #include "dcn35/dcn35_dccg.h"
index 4875faf..f5e02a1 100644 (file)
@@ -47,7 +47,7 @@
 #include "dce/dce_audio.h"
 #include "dce/dce_hwseq.h"
 #include "clk_mgr.h"
-#include "virtual/virtual_stream_encoder.h"
+#include "dio/virtual/virtual_stream_encoder.h"
 #include "dml/display_mode_vba.h"
 #include "dcn401/dcn401_dccg.h"
 #include "dcn10/dcn10_resource.h"
diff --git a/drivers/gpu/drm/amd/display/dc/virtual/Makefile b/drivers/gpu/drm/amd/display/dc/virtual/Makefile
deleted file mode 100644 (file)
index 931facd..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2017 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 virtual sub-component of DAL.
-# It provides the control and status of HW CRTC block.
-
-VIRTUAL = virtual_link_encoder.o virtual_stream_encoder.o virtual_link_hwss.o
-
-AMD_DAL_VIRTUAL = $(addprefix $(AMDDALPATH)/dc/virtual/,$(VIRTUAL))
-
-AMD_DISPLAY_FILES += $(AMD_DAL_VIRTUAL)
diff --git a/drivers/gpu/drm/amd/display/dc/virtual/virtual_link_encoder.c b/drivers/gpu/drm/amd/display/dc/virtual/virtual_link_encoder.c
deleted file mode 100644 (file)
index 1d226e0..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2012-15 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.
- *
- * Authors: AMD
- *
- */
-
-#include "dm_services.h"
-#include "dm_services_types.h"
-
-#include "virtual_link_encoder.h"
-
-static bool virtual_link_encoder_validate_output_with_stream(
-       struct link_encoder *enc,
-       const struct dc_stream_state *stream) { return true; }
-
-static void virtual_link_encoder_hw_init(struct link_encoder *enc) {}
-
-static void virtual_link_encoder_setup(
-       struct link_encoder *enc,
-       enum signal_type signal) {}
-
-static void virtual_link_encoder_enable_tmds_output(
-       struct link_encoder *enc,
-       enum clock_source_id clock_source,
-       enum dc_color_depth color_depth,
-       enum signal_type signal,
-       uint32_t pixel_clock) {}
-
-static void virtual_link_encoder_enable_dp_output(
-       struct link_encoder *enc,
-       const struct dc_link_settings *link_settings,
-       enum clock_source_id clock_source) {}
-
-static void virtual_link_encoder_enable_dp_mst_output(
-       struct link_encoder *enc,
-       const struct dc_link_settings *link_settings,
-       enum clock_source_id clock_source) {}
-
-static void virtual_link_encoder_disable_output(
-       struct link_encoder *link_enc,
-       enum signal_type signal) {}
-
-static void virtual_link_encoder_dp_set_lane_settings(
-       struct link_encoder *enc,
-       const struct dc_link_settings *link_settings,
-       const struct dc_lane_settings lane_settings[LANE_COUNT_DP_MAX]) {}
-
-static void virtual_link_encoder_dp_set_phy_pattern(
-       struct link_encoder *enc,
-       const struct encoder_set_dp_phy_pattern_param *param) {}
-
-static void virtual_link_encoder_update_mst_stream_allocation_table(
-       struct link_encoder *enc,
-       const struct link_mst_stream_allocation_table *table) {}
-
-static void virtual_link_encoder_connect_dig_be_to_fe(
-       struct link_encoder *enc,
-       enum engine_id engine,
-       bool connect) {}
-
-static void virtual_link_encoder_destroy(struct link_encoder **enc)
-{
-       kfree(*enc);
-       *enc = NULL;
-}
-
-static void virtual_link_encoder_get_max_link_cap(struct link_encoder *enc,
-               struct dc_link_settings *link_settings)
-{
-       /* Set Default link settings */
-       struct dc_link_settings max_link_cap = {LANE_COUNT_FOUR, LINK_RATE_HIGH,
-                               LINK_SPREAD_05_DOWNSPREAD_30KHZ, false, 0};
-       *link_settings = max_link_cap;
-}
-
-static const struct link_encoder_funcs virtual_lnk_enc_funcs = {
-       .validate_output_with_stream =
-               virtual_link_encoder_validate_output_with_stream,
-       .hw_init = virtual_link_encoder_hw_init,
-       .setup = virtual_link_encoder_setup,
-       .enable_tmds_output = virtual_link_encoder_enable_tmds_output,
-       .enable_dp_output = virtual_link_encoder_enable_dp_output,
-       .enable_dp_mst_output = virtual_link_encoder_enable_dp_mst_output,
-       .disable_output = virtual_link_encoder_disable_output,
-       .get_max_link_cap = virtual_link_encoder_get_max_link_cap,
-       .dp_set_lane_settings = virtual_link_encoder_dp_set_lane_settings,
-       .dp_set_phy_pattern = virtual_link_encoder_dp_set_phy_pattern,
-       .update_mst_stream_allocation_table =
-               virtual_link_encoder_update_mst_stream_allocation_table,
-       .connect_dig_be_to_fe = virtual_link_encoder_connect_dig_be_to_fe,
-       .destroy = virtual_link_encoder_destroy
-};
-
-bool virtual_link_encoder_construct(
-       struct link_encoder *enc, const struct encoder_init_data *init_data)
-{
-       enc->funcs = &virtual_lnk_enc_funcs;
-       enc->ctx = init_data->ctx;
-       enc->id = init_data->encoder;
-
-       enc->hpd_source = init_data->hpd_source;
-       enc->connector = init_data->connector;
-
-       enc->transmitter = init_data->transmitter;
-
-       enc->output_signals = SIGNAL_TYPE_VIRTUAL;
-
-       enc->preferred_engine = ENGINE_ID_VIRTUAL;
-
-       return true;
-}
-
-
diff --git a/drivers/gpu/drm/amd/display/dc/virtual/virtual_link_encoder.h b/drivers/gpu/drm/amd/display/dc/virtual/virtual_link_encoder.h
deleted file mode 100644 (file)
index eb1a94f..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2012-15 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.
- *
- * Authors: AMD
- *
- */
-
-#ifndef __DC_VIRTUAL_LINK_ENCODER_H__
-#define __DC_VIRTUAL_LINK_ENCODER_H__
-
-#include "link_encoder.h"
-
-bool virtual_link_encoder_construct(
-       struct link_encoder *enc, const struct encoder_init_data *init_data);
-
-#endif /* __DC_VIRTUAL_LINK_ENCODER_H__ */
diff --git a/drivers/gpu/drm/amd/display/dc/virtual/virtual_link_hwss.c b/drivers/gpu/drm/amd/display/dc/virtual/virtual_link_hwss.c
deleted file mode 100644 (file)
index 4f7f991..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.
- *
- * Authors: AMD
- *
- */
-
-#include "virtual_link_hwss.h"
-
-void virtual_setup_stream_encoder(struct pipe_ctx *pipe_ctx)
-{
-}
-
-void virtual_setup_stream_attribute(struct pipe_ctx *pipe_ctx)
-{
-}
-
-void virtual_reset_stream_encoder(struct pipe_ctx *pipe_ctx)
-{
-}
-
-static void virtual_disable_link_output(struct dc_link *link,
-       const struct link_resource *link_res,
-       enum signal_type signal)
-{
-}
-
-static const struct link_hwss virtual_link_hwss = {
-       .setup_stream_encoder = virtual_setup_stream_encoder,
-       .reset_stream_encoder = virtual_reset_stream_encoder,
-       .setup_stream_attribute = virtual_setup_stream_attribute,
-       .disable_link_output = virtual_disable_link_output,
-};
-
-const struct link_hwss *get_virtual_link_hwss(void)
-{
-       return &virtual_link_hwss;
-}
diff --git a/drivers/gpu/drm/amd/display/dc/virtual/virtual_link_hwss.h b/drivers/gpu/drm/amd/display/dc/virtual/virtual_link_hwss.h
deleted file mode 100644 (file)
index fbcbc5a..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- *
- * Authors: AMD
- *
- */
-#ifndef __DC_VIRTUAL_LINK_HWSS_H__
-#define __DC_VIRTUAL_LINK_HWSS_H__
-
-#include "core_types.h"
-
-void virtual_setup_stream_encoder(struct pipe_ctx *pipe_ctx);
-void virtual_setup_stream_attribute(struct pipe_ctx *pipe_ctx);
-void virtual_reset_stream_encoder(struct pipe_ctx *pipe_ctx);
-const struct link_hwss *get_virtual_link_hwss(void);
-
-#endif /* __DC_VIRTUAL_LINK_HWSS_H__ */
diff --git a/drivers/gpu/drm/amd/display/dc/virtual/virtual_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/virtual/virtual_stream_encoder.c
deleted file mode 100644 (file)
index ad088d7..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright 2012-15 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.
- *
- * Authors: AMD
- *
- */
-
-#include "dm_services.h"
-#include "virtual_stream_encoder.h"
-
-static void virtual_stream_encoder_dp_set_stream_attribute(
-       struct stream_encoder *enc,
-       struct dc_crtc_timing *crtc_timing,
-       enum dc_color_space output_color_space,
-       bool use_vsc_sdp_for_colorimetry,
-       uint32_t enable_sdp_splitting) {}
-
-static void virtual_stream_encoder_hdmi_set_stream_attribute(
-       struct stream_encoder *enc,
-       struct dc_crtc_timing *crtc_timing,
-       int actual_pix_clk_khz,
-       bool enable_audio) {}
-
-static void virtual_stream_encoder_dvi_set_stream_attribute(
-       struct stream_encoder *enc,
-       struct dc_crtc_timing *crtc_timing,
-       bool is_dual_link) {}
-
-static void virtual_stream_encoder_set_throttled_vcp_size(
-       struct stream_encoder *enc,
-       struct fixed31_32 avg_time_slots_per_mtp)
-{}
-
-static void virtual_stream_encoder_update_hdmi_info_packets(
-       struct stream_encoder *enc,
-       const struct encoder_info_frame *info_frame) {}
-
-static void virtual_stream_encoder_stop_hdmi_info_packets(
-       struct stream_encoder *enc) {}
-
-static void virtual_stream_encoder_set_avmute(
-       struct stream_encoder *enc,
-       bool enable) {}
-static void virtual_stream_encoder_update_dp_info_packets(
-       struct stream_encoder *enc,
-       const struct encoder_info_frame *info_frame) {}
-
-static void virtual_stream_encoder_stop_dp_info_packets(
-       struct stream_encoder *enc) {}
-
-static void virtual_stream_encoder_dp_blank(
-       struct dc_link *link,
-       struct stream_encoder *enc) {}
-
-static void virtual_stream_encoder_dp_unblank(
-       struct dc_link *link,
-       struct stream_encoder *enc,
-       const struct encoder_unblank_param *param) {}
-
-static void virtual_audio_mute_control(
-       struct stream_encoder *enc,
-       bool mute) {}
-
-static void virtual_stream_encoder_reset_hdmi_stream_attribute(
-               struct stream_encoder *enc)
-{}
-
-static void virtual_enc_dp_set_odm_combine(
-       struct stream_encoder *enc,
-       bool odm_combine)
-{}
-
-static void virtual_dig_connect_to_otg(
-               struct stream_encoder *enc,
-               int tg_inst)
-{}
-
-static void virtual_setup_stereo_sync(
-                       struct stream_encoder *enc,
-                       int tg_inst,
-                       bool enable)
-{}
-
-static void virtual_stream_encoder_set_dsc_pps_info_packet(
-               struct stream_encoder *enc,
-               bool enable,
-               uint8_t *dsc_packed_pps,
-               bool immediate_update)
-{}
-
-static const struct stream_encoder_funcs virtual_str_enc_funcs = {
-       .dp_set_odm_combine =
-               virtual_enc_dp_set_odm_combine,
-       .dp_set_stream_attribute =
-               virtual_stream_encoder_dp_set_stream_attribute,
-       .hdmi_set_stream_attribute =
-               virtual_stream_encoder_hdmi_set_stream_attribute,
-       .dvi_set_stream_attribute =
-               virtual_stream_encoder_dvi_set_stream_attribute,
-       .set_throttled_vcp_size =
-               virtual_stream_encoder_set_throttled_vcp_size,
-       .update_hdmi_info_packets =
-               virtual_stream_encoder_update_hdmi_info_packets,
-       .stop_hdmi_info_packets =
-               virtual_stream_encoder_stop_hdmi_info_packets,
-       .update_dp_info_packets =
-               virtual_stream_encoder_update_dp_info_packets,
-       .stop_dp_info_packets =
-               virtual_stream_encoder_stop_dp_info_packets,
-       .dp_blank =
-               virtual_stream_encoder_dp_blank,
-       .dp_unblank =
-               virtual_stream_encoder_dp_unblank,
-
-       .audio_mute_control = virtual_audio_mute_control,
-       .set_avmute = virtual_stream_encoder_set_avmute,
-       .hdmi_reset_stream_attribute = virtual_stream_encoder_reset_hdmi_stream_attribute,
-       .dig_connect_to_otg = virtual_dig_connect_to_otg,
-       .setup_stereo_sync = virtual_setup_stereo_sync,
-       .dp_set_dsc_pps_info_packet = virtual_stream_encoder_set_dsc_pps_info_packet,
-};
-
-bool virtual_stream_encoder_construct(
-       struct stream_encoder *enc,
-       struct dc_context *ctx,
-       struct dc_bios *bp)
-{
-       if (!enc)
-               return false;
-       if (!bp)
-               return false;
-
-       enc->funcs = &virtual_str_enc_funcs;
-       enc->ctx = ctx;
-       enc->id = ENGINE_ID_VIRTUAL;
-       enc->bp = bp;
-
-       return true;
-}
-
-struct stream_encoder *virtual_stream_encoder_create(
-       struct dc_context *ctx, struct dc_bios *bp)
-{
-       struct stream_encoder *enc = kzalloc(sizeof(*enc), GFP_KERNEL);
-
-       if (!enc)
-               return NULL;
-
-       if (virtual_stream_encoder_construct(enc, ctx, bp))
-               return enc;
-
-       BREAK_TO_DEBUGGER();
-       kfree(enc);
-       return NULL;
-}
-
diff --git a/drivers/gpu/drm/amd/display/dc/virtual/virtual_stream_encoder.h b/drivers/gpu/drm/amd/display/dc/virtual/virtual_stream_encoder.h
deleted file mode 100644 (file)
index bf3422c..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2012-15 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.
- *
- * Authors: AMD
- *
- */
-
-#ifndef __DC_VIRTUAL_STREAM_ENCODER_H__
-#define __DC_VIRTUAL_STREAM_ENCODER_H__
-
-#include "stream_encoder.h"
-
-struct stream_encoder *virtual_stream_encoder_create(
-       struct dc_context *ctx, struct dc_bios *bp);
-
-bool virtual_stream_encoder_construct(
-       struct stream_encoder *enc,
-       struct dc_context *ctx,
-       struct dc_bios *bp);
-
-#endif /* __DC_VIRTUAL_STREAM_ENCODER_H__ */