aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlene Liu <[email protected]>2019-03-29 19:40:58 -0400
committerAlex Deucher <[email protected]>2019-06-22 09:34:09 -0500
commitede37e4ce4957166706f0fdb727ae912d6e65589 (patch)
tree5ec3c14d24cced83e5798cb6ff4b3d47bb67a8fd
parent8e27a2d4cd76095c80dbbf63548175659d4b9d76 (diff)
drm/amd/display: fix can not turn on two displays due to DSC_RESOURCE failed.
[Why] Can not turn on two displays at the same time with the asic having only one DSC. DC_DSC_RESOURCE allocation failed. [Solution] Only add_dsc if the timing is dsc capable based on diag_dc and num_dsc Signed-off-by: Charlene Liu <[email protected]> Reviewed-by: Wesley Chalmers <[email protected]> Acked-by: Bhawanpreet Lakha <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
-rw-r--r--drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
index dc3aa7debad5..e3cd3e3db2c4 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
@@ -1284,6 +1284,12 @@ enum dc_status dcn20_add_stream_to_ctx(struct dc *dc, struct dc_state *new_ctx,
if (pipe_ctx->stream != dc_stream)
continue;
+ if (IS_DIAG_DC(dc->ctx->dce_environment) ||
+ dc->res_pool->res_cap->num_dsc == 1) {
+ // Diags build can also run on platforms that have fewer DSCs than pipes.
+ // In that case, add DSC only if needed by timing.
+ is_add_dsc = (dc_stream->timing.flags.DSC == 1);
+ }
if (is_add_dsc) {
pipe_ctx->stream_res.dsc = acquire_dsc(&new_ctx->res_ctx, pool);