continue;
mutex_lock(&aconnector->hpd_lock);
- dc_link_detect(aconnector->dc_link, false);
+ dc_link_detect(aconnector->dc_link, DETECT_REASON_HPD);
aconnector->dc_sink = NULL;
amdgpu_dm_update_connector_after_detect(aconnector);
mutex_unlock(&aconnector->hpd_lock);
* since (for MST case) MST does this in it's own context.
*/
mutex_lock(&aconnector->hpd_lock);
- if (dc_link_detect(aconnector->dc_link, false)) {
+ if (dc_link_detect(aconnector->dc_link, DETECT_REASON_HPD)) {
amdgpu_dm_update_connector_after_detect(aconnector);
if (dc_link_handle_hpd_rx_irq(aconnector->dc_link, NULL) &&
!is_mst_root_connector) {
/* Downstream Port status changed. */
- if (dc_link_detect(aconnector->dc_link, false)) {
+ if (dc_link_detect(aconnector->dc_link, DETECT_REASON_HPDRX)) {
amdgpu_dm_update_connector_after_detect(aconnector);
goto fail_free_encoder;
}
- if (dc_link_detect(dc_get_link_at_index(dm->dc, i), true))
+ if (dc_link_detect(dc_get_link_at_index(dm->dc, i),
+ DETECT_REASON_BOOT))
amdgpu_dm_update_connector_after_detect(aconnector);
}
* @brief
* Detect output sink type
*/
-static enum signal_type link_detect_sink(struct dc_link *link)
+static enum signal_type link_detect_sink(
+ struct dc_link *link,
+ enum dc_detect_reason reason)
{
enum signal_type result = get_basic_signal_type(
link->link_enc->id, link->link_id);
}
break;
case CONNECTOR_ID_DISPLAY_PORT: {
-
- /* Check whether DP signal detected: if not -
- * we assume signal is DVI; it could be corrected
- * to HDMI after dongle detection */
- if (!is_dp_sink_present(link))
- result = SIGNAL_TYPE_DVI_SINGLE_LINK;
+ /* DP HPD short pulse. Passive DP dongle will not
+ * have short pulse
+ */
+ if (reason != DETECT_REASON_HPDRX) {
+ /* Check whether DP signal detected: if not -
+ * we assume signal is DVI; it could be corrected
+ * to HDMI after dongle detection
+ */
+ if (!is_dp_sink_present(link))
+ result = SIGNAL_TYPE_DVI_SINGLE_LINK;
+ }
}
break;
default:
struct display_sink_capability *sink_caps,
bool *converter_disable_audio,
struct audio_support *audio_support,
- bool boot)
+ enum dc_detect_reason reason)
{
- sink_caps->signal = link_detect_sink(link);
+ bool boot = false;
+ sink_caps->signal = link_detect_sink(link, reason);
sink_caps->transaction_type =
get_ddc_transaction_type(sink_caps->signal);
* Need check ->sink usages in case ->sink = NULL
* TODO: s3 resume check
*/
+ if (reason == DETECT_REASON_BOOT)
+ boot = true;
if (dm_helpers_dp_mst_start_top_mgr(
link->ctx,
}
}
-bool dc_link_detect(struct dc_link *link, bool boot)
+bool dc_link_detect(struct dc_link *link, enum dc_detect_reason reason)
{
struct dc_sink_init_data sink_init_data = { 0 };
struct display_sink_capability sink_caps = { 0 };
link,
&sink_caps,
&converter_disable_audio,
- aud_support, boot);
+ aud_support, reason);
/* Active dongle downstream unplug */
if (link->type == dc_connection_active_dongle