diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2757-drm-amd-display-Move-dc_link-interface-to-separate-h.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2757-drm-amd-display-Move-dc_link-interface-to-separate-h.patch | 423 |
1 files changed, 423 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2757-drm-amd-display-Move-dc_link-interface-to-separate-h.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2757-drm-amd-display-Move-dc_link-interface-to-separate-h.patch new file mode 100644 index 00000000..438c9566 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2757-drm-amd-display-Move-dc_link-interface-to-separate-h.patch @@ -0,0 +1,423 @@ +From c782c8f0af00714d9be74f0e2ba6f96636a74912 Mon Sep 17 00:00:00 2001 +From: Harry Wentland <harry.wentland@amd.com> +Date: Wed, 8 Nov 2017 14:59:48 -0500 +Subject: [PATCH 2757/4131] drm/amd/display: Move dc_link interface to separate + header + +Signed-off-by: Harry Wentland <harry.wentland@amd.com> +Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> +Acked-by: Harry Wentland <harry.wentland@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/display/dc/dc.h | 175 +------------------------- + drivers/gpu/drm/amd/display/dc/dc_link.h | 207 +++++++++++++++++++++++++++++++ + 2 files changed, 208 insertions(+), 174 deletions(-) + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_link.h + +diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h +index 9bfbab0..5d18bcd 100644 +--- a/drivers/gpu/drm/amd/display/dc/dc.h ++++ b/drivers/gpu/drm/amd/display/dc/dc.h +@@ -665,171 +665,7 @@ struct dpcd_caps { + bool dpcd_display_control_capable; + }; + +-struct dc_link_status { +- struct dpcd_caps *dpcd_caps; +-}; +- +-/* DP MST stream allocation (payload bandwidth number) */ +-struct link_mst_stream_allocation { +- /* DIG front */ +- const struct stream_encoder *stream_enc; +- /* associate DRM payload table with DC stream encoder */ +- uint8_t vcp_id; +- /* number of slots required for the DP stream in transport packet */ +- uint8_t slot_count; +-}; +- +-/* DP MST stream allocation table */ +-struct link_mst_stream_allocation_table { +- /* number of DP video streams */ +- int stream_count; +- /* array of stream allocations */ +- struct link_mst_stream_allocation stream_allocations[MAX_CONTROLLER_NUM]; +-}; +- +-/* +- * A link contains one or more sinks and their connected status. +- * The currently active signal type (HDMI, DP-SST, DP-MST) is also reported. +- */ +-struct dc_link { +- struct dc_sink *remote_sinks[MAX_SINKS_PER_LINK]; +- unsigned int sink_count; +- struct dc_sink *local_sink; +- unsigned int link_index; +- enum dc_connection_type type; +- enum signal_type connector_signal; +- enum dc_irq_source irq_source_hpd; +- enum dc_irq_source irq_source_hpd_rx;/* aka DP Short Pulse */ +- /* caps is the same as reported_link_cap. link_traing use +- * reported_link_cap. Will clean up. TODO +- */ +- struct dc_link_settings reported_link_cap; +- struct dc_link_settings verified_link_cap; +- struct dc_link_settings cur_link_settings; +- struct dc_lane_settings cur_lane_setting; +- struct dc_link_settings preferred_link_setting; +- +- uint8_t ddc_hw_inst; +- +- uint8_t hpd_src; +- +- uint8_t link_enc_hw_inst; +- +- bool test_pattern_enabled; +- union compliance_test_state compliance_test_state; +- +- void *priv; +- +- struct ddc_service *ddc; +- +- bool aux_mode; +- +- /* Private to DC core */ +- +- const struct dc *dc; +- +- struct dc_context *ctx; +- +- struct link_encoder *link_enc; +- struct graphics_object_id link_id; +- union ddi_channel_mapping ddi_channel_mapping; +- struct connector_device_tag_info device_tag; +- struct dpcd_caps dpcd_caps; +- unsigned short chip_caps; +- unsigned int dpcd_sink_count; +- enum edp_revision edp_revision; +- bool psr_enabled; +- +- /* MST record stream using this link */ +- struct link_flags { +- bool dp_keep_receiver_powered; +- } wa_flags; +- struct link_mst_stream_allocation_table mst_stream_alloc_table; +- +- struct dc_link_status link_status; +- +-}; +- +-const struct dc_link_status *dc_link_get_status(const struct dc_link *dc_link); +- +-/* +- * Return an enumerated dc_link. dc_link order is constant and determined at +- * boot time. They cannot be created or destroyed. +- * Use dc_get_caps() to get number of links. +- */ +-static inline struct dc_link *dc_get_link_at_index(struct dc *dc, uint32_t link_index) +-{ +- return dc->links[link_index]; +-} +- +-/* Set backlight level of an embedded panel (eDP, LVDS). */ +-bool dc_link_set_backlight_level(const struct dc_link *dc_link, uint32_t level, +- uint32_t frame_ramp, const struct dc_stream_state *stream); +- +-bool dc_link_set_psr_enable(const struct dc_link *dc_link, bool enable, bool wait); +- +-bool dc_link_get_psr_state(const struct dc_link *dc_link, uint32_t *psr_state); +- +-bool dc_link_setup_psr(struct dc_link *dc_link, +- const struct dc_stream_state *stream, struct psr_config *psr_config, +- struct psr_context *psr_context); +- +-/* Request DC to detect if there is a Panel connected. +- * boot - If this call is during initial boot. +- * Return false for any type of detection failure or MST detection +- * true otherwise. True meaning further action is required (status update +- * and OS notification). +- */ +-enum dc_detect_reason { +- DETECT_REASON_BOOT, +- DETECT_REASON_HPD, +- DETECT_REASON_HPDRX, +-}; +- +-bool dc_link_detect(struct dc_link *dc_link, enum dc_detect_reason reason); +- +-/* Notify DC about DP RX Interrupt (aka Short Pulse Interrupt). +- * Return: +- * true - Downstream port status changed. DM should call DC to do the +- * detection. +- * false - no change in Downstream port status. No further action required +- * from DM. */ +-bool dc_link_handle_hpd_rx_irq(struct dc_link *dc_link, +- union hpd_irq_data *hpd_irq_dpcd_data); +- +-struct dc_sink_init_data; +- +-struct dc_sink *dc_link_add_remote_sink( +- struct dc_link *dc_link, +- const uint8_t *edid, +- int len, +- struct dc_sink_init_data *init_data); +- +-void dc_link_remove_remote_sink( +- struct dc_link *link, +- struct dc_sink *sink); +- +-/* Used by diagnostics for virtual link at the moment */ +- +-void dc_link_dp_set_drive_settings( +- struct dc_link *link, +- struct link_training_settings *lt_settings); +- +-enum link_training_result dc_link_dp_perform_link_training( +- struct dc_link *link, +- const struct dc_link_settings *link_setting, +- bool skip_video_pattern); +- +-void dc_link_dp_enable_hpd(const struct dc_link *link); +- +-void dc_link_dp_disable_hpd(const struct dc_link *link); +- +-bool dc_link_dp_set_test_pattern( +- struct dc_link *link, +- enum dp_test_pattern test_pattern, +- const struct link_training_settings *p_link_settings, +- const unsigned char *p_custom_pattern, +- unsigned int cust_pattern_size); ++#include "dc_link.h" + + /******************************************************************************* + * Sink Interfaces - A sink corresponds to a display output device +@@ -909,13 +745,4 @@ void dc_set_power_state( + enum dc_acpi_cm_power_state power_state); + void dc_resume(struct dc *dc); + +-/* +- * DPCD access interfaces +- */ +- +-bool dc_submit_i2c( +- struct dc *dc, +- uint32_t link_index, +- struct i2c_command *cmd); +- + #endif /* DC_INTERFACE_H_ */ +diff --git a/drivers/gpu/drm/amd/display/dc/dc_link.h b/drivers/gpu/drm/amd/display/dc/dc_link.h +new file mode 100644 +index 0000000..f11a734 +--- /dev/null ++++ b/drivers/gpu/drm/amd/display/dc/dc_link.h +@@ -0,0 +1,207 @@ ++/* ++ * Copyright 2012-14 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_H_ ++#define DC_LINK_H_ ++ ++#include "dc_types.h" ++#include "grph_object_defs.h" ++ ++struct dc_link_status { ++ struct dpcd_caps *dpcd_caps; ++}; ++ ++/* DP MST stream allocation (payload bandwidth number) */ ++struct link_mst_stream_allocation { ++ /* DIG front */ ++ const struct stream_encoder *stream_enc; ++ /* associate DRM payload table with DC stream encoder */ ++ uint8_t vcp_id; ++ /* number of slots required for the DP stream in transport packet */ ++ uint8_t slot_count; ++}; ++ ++/* DP MST stream allocation table */ ++struct link_mst_stream_allocation_table { ++ /* number of DP video streams */ ++ int stream_count; ++ /* array of stream allocations */ ++ struct link_mst_stream_allocation stream_allocations[MAX_CONTROLLER_NUM]; ++}; ++ ++/* ++ * A link contains one or more sinks and their connected status. ++ * The currently active signal type (HDMI, DP-SST, DP-MST) is also reported. ++ */ ++struct dc_link { ++ struct dc_sink *remote_sinks[MAX_SINKS_PER_LINK]; ++ unsigned int sink_count; ++ struct dc_sink *local_sink; ++ unsigned int link_index; ++ enum dc_connection_type type; ++ enum signal_type connector_signal; ++ enum dc_irq_source irq_source_hpd; ++ enum dc_irq_source irq_source_hpd_rx;/* aka DP Short Pulse */ ++ /* caps is the same as reported_link_cap. link_traing use ++ * reported_link_cap. Will clean up. TODO ++ */ ++ struct dc_link_settings reported_link_cap; ++ struct dc_link_settings verified_link_cap; ++ struct dc_link_settings cur_link_settings; ++ struct dc_lane_settings cur_lane_setting; ++ struct dc_link_settings preferred_link_setting; ++ ++ uint8_t ddc_hw_inst; ++ ++ uint8_t hpd_src; ++ ++ uint8_t link_enc_hw_inst; ++ ++ bool test_pattern_enabled; ++ union compliance_test_state compliance_test_state; ++ ++ void *priv; ++ ++ struct ddc_service *ddc; ++ ++ bool aux_mode; ++ ++ /* Private to DC core */ ++ ++ const struct dc *dc; ++ ++ struct dc_context *ctx; ++ ++ struct link_encoder *link_enc; ++ struct graphics_object_id link_id; ++ union ddi_channel_mapping ddi_channel_mapping; ++ struct connector_device_tag_info device_tag; ++ struct dpcd_caps dpcd_caps; ++ unsigned short chip_caps; ++ unsigned int dpcd_sink_count; ++ enum edp_revision edp_revision; ++ bool psr_enabled; ++ ++ /* MST record stream using this link */ ++ struct link_flags { ++ bool dp_keep_receiver_powered; ++ } wa_flags; ++ struct link_mst_stream_allocation_table mst_stream_alloc_table; ++ ++ struct dc_link_status link_status; ++ ++}; ++ ++const struct dc_link_status *dc_link_get_status(const struct dc_link *dc_link); ++ ++/* ++ * Return an enumerated dc_link. dc_link order is constant and determined at ++ * boot time. They cannot be created or destroyed. ++ * Use dc_get_caps() to get number of links. ++ */ ++static inline struct dc_link *dc_get_link_at_index(struct dc *dc, uint32_t link_index) ++{ ++ return dc->links[link_index]; ++} ++ ++/* Set backlight level of an embedded panel (eDP, LVDS). */ ++bool dc_link_set_backlight_level(const struct dc_link *dc_link, uint32_t level, ++ uint32_t frame_ramp, const struct dc_stream_state *stream); ++ ++bool dc_link_set_psr_enable(const struct dc_link *dc_link, bool enable, bool wait); ++ ++bool dc_link_get_psr_state(const struct dc_link *dc_link, uint32_t *psr_state); ++ ++bool dc_link_setup_psr(struct dc_link *dc_link, ++ const struct dc_stream_state *stream, struct psr_config *psr_config, ++ struct psr_context *psr_context); ++ ++/* Request DC to detect if there is a Panel connected. ++ * boot - If this call is during initial boot. ++ * Return false for any type of detection failure or MST detection ++ * true otherwise. True meaning further action is required (status update ++ * and OS notification). ++ */ ++enum dc_detect_reason { ++ DETECT_REASON_BOOT, ++ DETECT_REASON_HPD, ++ DETECT_REASON_HPDRX, ++}; ++ ++bool dc_link_detect(struct dc_link *dc_link, enum dc_detect_reason reason); ++ ++/* Notify DC about DP RX Interrupt (aka Short Pulse Interrupt). ++ * Return: ++ * true - Downstream port status changed. DM should call DC to do the ++ * detection. ++ * false - no change in Downstream port status. No further action required ++ * from DM. */ ++bool dc_link_handle_hpd_rx_irq(struct dc_link *dc_link, ++ union hpd_irq_data *hpd_irq_dpcd_data); ++ ++struct dc_sink_init_data; ++ ++struct dc_sink *dc_link_add_remote_sink( ++ struct dc_link *dc_link, ++ const uint8_t *edid, ++ int len, ++ struct dc_sink_init_data *init_data); ++ ++void dc_link_remove_remote_sink( ++ struct dc_link *link, ++ struct dc_sink *sink); ++ ++/* Used by diagnostics for virtual link at the moment */ ++ ++void dc_link_dp_set_drive_settings( ++ struct dc_link *link, ++ struct link_training_settings *lt_settings); ++ ++enum link_training_result dc_link_dp_perform_link_training( ++ struct dc_link *link, ++ const struct dc_link_settings *link_setting, ++ bool skip_video_pattern); ++ ++void dc_link_dp_enable_hpd(const struct dc_link *link); ++ ++void dc_link_dp_disable_hpd(const struct dc_link *link); ++ ++bool dc_link_dp_set_test_pattern( ++ struct dc_link *link, ++ enum dp_test_pattern test_pattern, ++ const struct link_training_settings *p_link_settings, ++ const unsigned char *p_custom_pattern, ++ unsigned int cust_pattern_size); ++ ++/* ++ * DPCD access interfaces ++ */ ++ ++bool dc_submit_i2c( ++ struct dc *dc, ++ uint32_t link_index, ++ struct i2c_command *cmd); ++ ++#endif /* DC_LINK_H_ */ +-- +2.7.4 + |