Skip to content

Commit d8d16fc

Browse files
WangSungHuaigregkh
authored andcommitted
Revert "drm/amd/display: Handle HPD_IRQ for internal link"
commit a2919b2 upstream. [How&Why] This reverts commit 239b31b. Due to the it effects Replay resync. Reviewed-by: Wenjing Liu <wenjing.liu@amd.com> Acked-by: Zaeem Mohamed <zaeem.mohamed@amd.com> Signed-off-by: Sung-huai Wang <danny.wang@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 3118c43 commit d8d16fc

1 file changed

Lines changed: 9 additions & 15 deletions

File tree

drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_irq_handler.c

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,6 @@ bool dp_handle_hpd_rx_irq(struct dc_link *link,
373373
union device_service_irq device_service_clear = {0};
374374
enum dc_status result;
375375
bool status = false;
376-
bool allow_active = false;
377376

378377
if (out_link_loss)
379378
*out_link_loss = false;
@@ -428,6 +427,12 @@ bool dp_handle_hpd_rx_irq(struct dc_link *link,
428427
return false;
429428
}
430429

430+
if (handle_hpd_irq_psr_sink(link))
431+
/* PSR-related error was detected and handled */
432+
return true;
433+
434+
handle_hpd_irq_replay_sink(link);
435+
431436
/* If PSR-related error handled, Main link may be off,
432437
* so do not handle as a normal sink status change interrupt.
433438
*/
@@ -449,8 +454,10 @@ bool dp_handle_hpd_rx_irq(struct dc_link *link,
449454
* If we got sink count changed it means
450455
* Downstream port status changed,
451456
* then DM should call DC to do the detection.
457+
* NOTE: Do not handle link loss on eDP since it is internal link
452458
*/
453-
if (dp_parse_link_loss_status(
459+
if ((link->connector_signal != SIGNAL_TYPE_EDP) &&
460+
dp_parse_link_loss_status(
454461
link,
455462
&hpd_irq_dpcd_data)) {
456463
/* Connectivity log: link loss */
@@ -459,11 +466,6 @@ bool dp_handle_hpd_rx_irq(struct dc_link *link,
459466
sizeof(hpd_irq_dpcd_data),
460467
"Status: ");
461468

462-
if (link->psr_settings.psr_feature_enabled)
463-
edp_set_psr_allow_active(link, &allow_active, true, false, NULL);
464-
else if (link->replay_settings.replay_allow_active)
465-
edp_set_replay_allow_active(link, &allow_active, true, false, NULL);
466-
467469
if (defer_handling && has_left_work)
468470
*has_left_work = true;
469471
else
@@ -476,14 +478,6 @@ bool dp_handle_hpd_rx_irq(struct dc_link *link,
476478
dp_trace_link_loss_increment(link);
477479
}
478480

479-
if (*out_link_loss == false) {
480-
if (handle_hpd_irq_psr_sink(link))
481-
/* PSR-related error was detected and handled */
482-
return true;
483-
484-
handle_hpd_irq_replay_sink(link);
485-
}
486-
487481
if (link->type == dc_connection_sst_branch &&
488482
hpd_irq_dpcd_data.bytes.sink_cnt.bits.SINK_COUNT
489483
!= link->dpcd_sink_count)

0 commit comments

Comments
 (0)