Commit b0c4e977 authored by John Barberiz's avatar John Barberiz Committed by Alex Deucher

drm/amd/display: Remove delay on disconnect patch

HDMI HPD's generic solution makes the monitor
patch code unnecessary so anything related has
been removed.
Signed-off-by: default avatarJohn Barberiz <jbarberi@amd.com>
Reviewed-by: default avatarJohn Barberiz <jbarberi@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a0a31ec4
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
dm_logger_write(dc_ctx->logger, LOG_HW_HOTPLUG, \ dm_logger_write(dc_ctx->logger, LOG_HW_HOTPLUG, \
__VA_ARGS__) __VA_ARGS__)
#define DEFAULT_DELAY_DISCONNECT 100
/******************************************************************************* /*******************************************************************************
* Private structures * Private structures
******************************************************************************/ ******************************************************************************/
...@@ -118,7 +117,7 @@ struct gpio *get_hpd_gpio(struct dc_bios *dcb, ...@@ -118,7 +117,7 @@ struct gpio *get_hpd_gpio(struct dc_bios *dcb,
* true on success, false otherwise * true on success, false otherwise
*/ */
static bool program_hpd_filter( static bool program_hpd_filter(
const struct dc_link *link, int default_disconnect_delay) const struct dc_link *link)
{ {
bool result = false; bool result = false;
...@@ -136,7 +135,7 @@ static bool program_hpd_filter( ...@@ -136,7 +135,7 @@ static bool program_hpd_filter(
case SIGNAL_TYPE_HDMI_TYPE_A: case SIGNAL_TYPE_HDMI_TYPE_A:
/* Program hpd filter */ /* Program hpd filter */
delay_on_connect_in_ms = 500; delay_on_connect_in_ms = 500;
delay_on_disconnect_in_ms = default_disconnect_delay; delay_on_disconnect_in_ms = 100;
break; break;
case SIGNAL_TYPE_DISPLAY_PORT: case SIGNAL_TYPE_DISPLAY_PORT:
case SIGNAL_TYPE_DISPLAY_PORT_MST: case SIGNAL_TYPE_DISPLAY_PORT_MST:
...@@ -700,13 +699,6 @@ bool dc_link_detect(struct dc_link *link, enum dc_detect_reason reason) ...@@ -700,13 +699,6 @@ bool dc_link_detect(struct dc_link *link, enum dc_detect_reason reason)
dp_hbr_verify_link_cap(link, &link->reported_link_cap); dp_hbr_verify_link_cap(link, &link->reported_link_cap);
} }
/* Add delay for certain monitors */
if (sink->edid_caps.panel_patch.disconnect_delay > 0
&& sink->sink_signal == SIGNAL_TYPE_HDMI_TYPE_A)
program_hpd_filter(link, sink->edid_caps.panel_patch.disconnect_delay);
else
program_hpd_filter(link, DEFAULT_DELAY_DISCONNECT);
/* HDMI-DVI Dongle */ /* HDMI-DVI Dongle */
if (sink->sink_signal == SIGNAL_TYPE_HDMI_TYPE_A && if (sink->sink_signal == SIGNAL_TYPE_HDMI_TYPE_A &&
!sink->edid_caps.edid_hdmi) !sink->edid_caps.edid_hdmi)
...@@ -1093,7 +1085,7 @@ static bool construct( ...@@ -1093,7 +1085,7 @@ static bool construct(
* If GPIO isn't programmed correctly HPD might not rise or drain * If GPIO isn't programmed correctly HPD might not rise or drain
* fast enough, leading to bounces. * fast enough, leading to bounces.
*/ */
program_hpd_filter(link, DEFAULT_DELAY_DISCONNECT); program_hpd_filter(link);
return true; return true;
device_tag_fail: device_tag_fail:
...@@ -2018,7 +2010,7 @@ const struct dc_link_status *dc_link_get_status(const struct dc_link *link) ...@@ -2018,7 +2010,7 @@ const struct dc_link_status *dc_link_get_status(const struct dc_link *link)
void core_link_resume(struct dc_link *link) void core_link_resume(struct dc_link *link)
{ {
if (link->connector_signal != SIGNAL_TYPE_VIRTUAL) if (link->connector_signal != SIGNAL_TYPE_VIRTUAL)
program_hpd_filter(link, DEFAULT_DELAY_DISCONNECT); program_hpd_filter(link);
} }
static struct fixed31_32 get_pbn_per_slot(struct dc_stream_state *stream) static struct fixed31_32 get_pbn_per_slot(struct dc_stream_state *stream)
......
...@@ -194,7 +194,6 @@ union display_content_support { ...@@ -194,7 +194,6 @@ union display_content_support {
}; };
struct dc_panel_patch { struct dc_panel_patch {
unsigned int disconnect_delay;
unsigned int dppowerup_delay; unsigned int dppowerup_delay;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment