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 <charlene.liu@amd.com>
Reviewed-by: Wesley Chalmers <Wesley.Chalmers@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 dc3aa7debad5d3e351d251c122896b6f62a5bc85..e3cd3e3db2c4bc826a9481397d88c9fb3fa9b8b9 100644 (file)
--- 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);