Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/amd/display: Add link index in AUX and dpms
[Why & How]
Add the link index in DP AUX transfer and DPMS functions.
Reviewed-by: Wenjing Liu <wenjing.liu@amd.com>
Signed-off-by: Cruise Hung <Cruise.Hung@amd.com>
Signed-off-by: Wayne Lin <wayne.lin@amd.com>
Tested-by: Dan Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
authored by
Cruise Hung
and committed by
Alex Deucher
c2223b26
9fd2da71
+19
-9
+13
-4
drivers/gpu/drm/amd/display/dc/dce/dce_aux.c
+13
-4
drivers/gpu/drm/amd/display/dc/dce/dce_aux.c
···
725
725
for (i = 0; i < AUX_MAX_RETRIES; i++) {
726
726
DC_TRACE_LEVEL_MESSAGE(DAL_TRACE_LEVEL_INFORMATION,
727
727
LOG_FLAG_I2cAux_DceAux,
728
-
"dce_aux_transfer_with_retries: link_index=%u: START: retry %d of %d: address=0x%04x length=%u write=%d mot=%d",
728
+
"dce_aux_transfer_with_retries: link_index=%u: START: retry %d of %d: "
729
+
"address=0x%04x length=%u write=%d mot=%d is_i2c=%d is_dpia=%d ddc_hw_inst=%d",
729
730
ddc && ddc->link ? ddc->link->link_index : UINT_MAX,
730
731
i + 1,
731
732
(int)AUX_MAX_RETRIES,
732
733
payload->address,
733
734
payload->length,
734
735
(unsigned int) payload->write,
735
-
(unsigned int) payload->mot);
736
+
(unsigned int) payload->mot,
737
+
payload->i2c_over_aux,
738
+
(ddc->link->ep_type == DISPLAY_ENDPOINT_USB4_DPIA) ? true : false,
739
+
ddc->link->ddc_hw_inst);
736
740
if (payload->write)
737
741
dce_aux_log_payload(" write", payload->data, payload->length, 16);
738
742
···
750
746
751
747
DC_TRACE_LEVEL_MESSAGE(DAL_TRACE_LEVEL_INFORMATION,
752
748
LOG_FLAG_I2cAux_DceAux,
753
-
"dce_aux_transfer_with_retries: link_index=%u: END: retry %d of %d: address=0x%04x length=%u write=%d mot=%d: ret=%d operation_result=%d payload->reply=%u",
749
+
"dce_aux_transfer_with_retries: link_index=%u: END: retry %d of %d: "
750
+
"address=0x%04x length=%u write=%d mot=%d: ret=%d operation_result=%d "
751
+
"payload->reply=%u is_i2c=%d is_dpia=%d ddc_hw_inst=%d",
754
752
ddc && ddc->link ? ddc->link->link_index : UINT_MAX,
755
753
i + 1,
756
754
(int)AUX_MAX_RETRIES,
···
762
756
(unsigned int) payload->mot,
763
757
ret,
764
758
(int)operation_result,
765
-
(unsigned int) *payload->reply);
759
+
(unsigned int) *payload->reply,
760
+
payload->i2c_over_aux,
761
+
(ddc->link->ep_type == DISPLAY_ENDPOINT_USB4_DPIA) ? true : false,
762
+
ddc->link->ddc_hw_inst);
766
763
if (!payload->write)
767
764
dce_aux_log_payload(" read", payload->data, ret > 0 ? ret : 0, 16);
768
765
+1
-1
drivers/gpu/drm/amd/display/dc/link/link_detection.c
+1
-1
drivers/gpu/drm/amd/display/dc/link/link_detection.c
···
656
656
return true;
657
657
658
658
is_in_alt_mode = link->link_enc->funcs->is_in_alt_mode(link->link_enc);
659
-
DC_LOG_DC("DP Alt mode state on HPD: %d\n", is_in_alt_mode);
659
+
DC_LOG_DC("DP Alt mode state on HPD: %d Link=%d\n", is_in_alt_mode, link->link_index);
660
660
661
661
if (is_in_alt_mode)
662
662
return true;
+5
-4
drivers/gpu/drm/amd/display/dc/link/link_dpms.c
+5
-4
drivers/gpu/drm/amd/display/dc/link/link_dpms.c
···
2358
2358
if (pipe_ctx->stream->sink) {
2359
2359
if (pipe_ctx->stream->sink->sink_signal != SIGNAL_TYPE_VIRTUAL &&
2360
2360
pipe_ctx->stream->sink->sink_signal != SIGNAL_TYPE_NONE) {
2361
-
DC_LOG_DC("%s pipe_ctx dispname=%s signal=%x\n", __func__,
2361
+
DC_LOG_DC("%s pipe_ctx dispname=%s signal=%x link=%d\n", __func__,
2362
2362
pipe_ctx->stream->sink->edid_caps.display_name,
2363
-
pipe_ctx->stream->signal);
2363
+
pipe_ctx->stream->signal, link->link_index);
2364
2364
}
2365
2365
}
2366
2366
···
2473
2473
if (pipe_ctx->stream->sink) {
2474
2474
if (pipe_ctx->stream->sink->sink_signal != SIGNAL_TYPE_VIRTUAL &&
2475
2475
pipe_ctx->stream->sink->sink_signal != SIGNAL_TYPE_NONE) {
2476
-
DC_LOG_DC("%s pipe_ctx dispname=%s signal=%x\n", __func__,
2476
+
DC_LOG_DC("%s pipe_ctx dispname=%s signal=%x link=%d\n", __func__,
2477
2477
pipe_ctx->stream->sink->edid_caps.display_name,
2478
-
pipe_ctx->stream->signal);
2478
+
pipe_ctx->stream->signal,
2479
+
link->link_index);
2479
2480
}
2480
2481
}
2481
2482