|
@@ -2559,23 +2559,24 @@ void core_link_enable_stream(
|
|
|
pipe_ctx->stream_res.stream_enc,
|
|
|
&stream->timing);
|
|
|
|
|
|
- resource_build_info_frame(pipe_ctx);
|
|
|
- core_dc->hwss.update_info_frame(pipe_ctx);
|
|
|
-
|
|
|
- /* eDP lit up by bios already, no need to enable again. */
|
|
|
- if (pipe_ctx->stream->signal == SIGNAL_TYPE_EDP &&
|
|
|
- pipe_ctx->stream->apply_edp_fast_boot_optimization) {
|
|
|
- pipe_ctx->stream->apply_edp_fast_boot_optimization = false;
|
|
|
- pipe_ctx->stream->dpms_off = false;
|
|
|
- return;
|
|
|
- }
|
|
|
+ if (!IS_FPGA_MAXIMUS_DC(core_dc->ctx->dce_environment)) {
|
|
|
+ resource_build_info_frame(pipe_ctx);
|
|
|
+ core_dc->hwss.update_info_frame(pipe_ctx);
|
|
|
+
|
|
|
+ /* eDP lit up by bios already, no need to enable again. */
|
|
|
+ if (pipe_ctx->stream->signal == SIGNAL_TYPE_EDP &&
|
|
|
+ pipe_ctx->stream->apply_edp_fast_boot_optimization) {
|
|
|
+ pipe_ctx->stream->apply_edp_fast_boot_optimization = false;
|
|
|
+ pipe_ctx->stream->dpms_off = false;
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
- if (pipe_ctx->stream->dpms_off)
|
|
|
- return;
|
|
|
+ if (pipe_ctx->stream->dpms_off)
|
|
|
+ return;
|
|
|
|
|
|
- status = enable_link(state, pipe_ctx);
|
|
|
+ status = enable_link(state, pipe_ctx);
|
|
|
|
|
|
- if (status != DC_OK) {
|
|
|
+ if (status != DC_OK) {
|
|
|
DC_LOG_WARNING("enabling link %u failed: %d\n",
|
|
|
pipe_ctx->stream->sink->link->link_index,
|
|
|
status);
|
|
@@ -2590,23 +2591,26 @@ void core_link_enable_stream(
|
|
|
BREAK_TO_DEBUGGER();
|
|
|
return;
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
- core_dc->hwss.enable_audio_stream(pipe_ctx);
|
|
|
+ core_dc->hwss.enable_audio_stream(pipe_ctx);
|
|
|
|
|
|
- /* turn off otg test pattern if enable */
|
|
|
- if (pipe_ctx->stream_res.tg->funcs->set_test_pattern)
|
|
|
- pipe_ctx->stream_res.tg->funcs->set_test_pattern(pipe_ctx->stream_res.tg,
|
|
|
- CONTROLLER_DP_TEST_PATTERN_VIDEOMODE,
|
|
|
- COLOR_DEPTH_UNDEFINED);
|
|
|
+ /* turn off otg test pattern if enable */
|
|
|
+ if (pipe_ctx->stream_res.tg->funcs->set_test_pattern)
|
|
|
+ pipe_ctx->stream_res.tg->funcs->set_test_pattern(pipe_ctx->stream_res.tg,
|
|
|
+ CONTROLLER_DP_TEST_PATTERN_VIDEOMODE,
|
|
|
+ COLOR_DEPTH_UNDEFINED);
|
|
|
|
|
|
- core_dc->hwss.enable_stream(pipe_ctx);
|
|
|
+ core_dc->hwss.enable_stream(pipe_ctx);
|
|
|
|
|
|
- if (pipe_ctx->stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST)
|
|
|
- allocate_mst_payload(pipe_ctx);
|
|
|
+ if (pipe_ctx->stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST)
|
|
|
+ allocate_mst_payload(pipe_ctx);
|
|
|
+
|
|
|
+ core_dc->hwss.unblank_stream(pipe_ctx,
|
|
|
+ &pipe_ctx->stream->sink->link->cur_link_settings);
|
|
|
+
|
|
|
+ }
|
|
|
|
|
|
- core_dc->hwss.unblank_stream(pipe_ctx,
|
|
|
- &pipe_ctx->stream->sink->link->cur_link_settings);
|
|
|
}
|
|
|
|
|
|
void core_link_disable_stream(struct pipe_ctx *pipe_ctx, int option)
|