diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/1703-drm-amd-display-use-dc_is_virtual-instead-of-ENUM.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/1703-drm-amd-display-use-dc_is_virtual-instead-of-ENUM.patch | 94 |
1 files changed, 94 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/1703-drm-amd-display-use-dc_is_virtual-instead-of-ENUM.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/1703-drm-amd-display-use-dc_is_virtual-instead-of-ENUM.patch new file mode 100644 index 00000000..065d62ec --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/1703-drm-amd-display-use-dc_is_virtual-instead-of-ENUM.patch @@ -0,0 +1,94 @@ +From 2598dd77a15a8cf63ab43463b96fd418ea872e63 Mon Sep 17 00:00:00 2001 +From: Eric Bernstein <eric.bernstein@amd.com> +Date: Thu, 28 Feb 2019 14:45:13 -0500 +Subject: [PATCH 1703/2940] drm/amd/display: use dc_is_virtual instead of ENUM + +Signed-off-by: Eric Bernstein <eric.bernstein@amd.com> +Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> +Reviewed-by: Nevenko Stupar <Nevenko.Stupar@amd.com> +Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> +--- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 7 +++---- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 ++- + .../gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 2 +- + 4 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c +index 23eb035ea09a..42bcd27a2dd4 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c +@@ -640,7 +640,8 @@ bool dc_link_detect(struct dc_link *link, enum dc_detect_reason reason) + bool same_dpcd = true; + enum dc_connection_type new_connection_type = dc_connection_none; + DC_LOGGER_INIT(link->ctx->logger); +- if (link->connector_signal == SIGNAL_TYPE_VIRTUAL) ++ ++ if (dc_is_virtual_signal(link->connector_signal)) + return false; + + if (false == dc_link_detect_sink(link, &new_connection_type)) { +@@ -1171,8 +1172,6 @@ static bool construct( + goto create_fail; + } + +- +- + /* TODO: #DAL3 Implement id to str function.*/ + LINK_INFO("Connector[%d] description:" + "signal %d\n", +@@ -2562,7 +2561,7 @@ void core_link_enable_stream( + enum dc_status status; + DC_LOGGER_INIT(pipe_ctx->stream->ctx->logger); + +- if (pipe_ctx->stream->signal != SIGNAL_TYPE_VIRTUAL) { ++ if (!dc_is_virtual_signal(pipe_ctx->stream->signal)) { + stream->link->link_enc->funcs->setup( + stream->link->link_enc, + pipe_ctx->stream->signal); +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +index 7d6747ecdeb5..9130f86475e7 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +@@ -2788,10 +2788,11 @@ enum dc_status dc_validate_stream(struct dc *dc, struct dc_stream_state *stream) + if (!tg->funcs->validate_timing(tg, &stream->timing)) + res = DC_FAIL_CONTROLLER_VALIDATE; + +- if (res == DC_OK) ++ if (res == DC_OK) { + if (!link->link_enc->funcs->validate_output_with_stream( + link->link_enc, stream)) + res = DC_FAIL_ENC_VALIDATE; ++ } + + /* TODO: validate audio ASIC caps, encoder */ + +diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +index 1c0f7aca83dd..5179de470946 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c ++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +@@ -1368,7 +1368,7 @@ static enum dc_status apply_single_controller_ctx_to_hw( + pipe_ctx->stream_res.tg->funcs->set_static_screen_control( + pipe_ctx->stream_res.tg, event_triggers); + +- if (pipe_ctx->stream->signal != SIGNAL_TYPE_VIRTUAL) ++ if (!dc_is_virtual_signal(pipe_ctx->stream->signal)) + pipe_ctx->stream_res.stream_enc->funcs->dig_connect_to_otg( + pipe_ctx->stream_res.stream_enc, + pipe_ctx->stream_res.tg->inst); +diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +index 02e9343951dd..2f28a74383f5 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +@@ -892,7 +892,7 @@ enum dc_status resource_map_phy_clock_resources( + return DC_ERROR_UNEXPECTED; + + if (dc_is_dp_signal(pipe_ctx->stream->signal) +- || pipe_ctx->stream->signal == SIGNAL_TYPE_VIRTUAL) ++ || dc_is_virtual_signal(pipe_ctx->stream->signal)) + pipe_ctx->clock_source = + dc->res_pool->dp_clock_source; + else +-- +2.17.1 + |