Acquire and release 3D LUT and shaper LUT every time we create/remove a
new ctx and add/remove stream to/from it. 3D LUT acquire/release can
fail and therefore we should check its availability during atomic check
considering the new context created not the current one.
Signed-off-by: Melissa Wen <mwen@igalia.com>
---
.../amd/display/dc/dcn301/dcn301_resource.c | 47 ++++++++++++++++++-
1 file changed, 45 insertions(+), 2 deletions(-)
@@ -1260,6 +1260,49 @@ static struct display_stream_compressor *dcn301_dsc_create(
return &dsc->base;
}
+static enum dc_status
+dcn301_add_stream_to_ctx(struct dc *dc,
+ struct dc_state *new_ctx,
+ struct dc_stream_state *dc_stream)
+{
+ enum dc_status result = DC_ERROR_UNEXPECTED;
+ struct dc_3dlut *lut3d_func_new = NULL;
+ struct dc_transfer_func *func_shaper_new = NULL;
+
+ result = dcn20_add_stream_to_ctx(dc, new_ctx, dc_stream);
+ if (result != DC_OK)
+ return result;
+
+ if (!dc_acquire_release_mpc_3dlut_for_ctx(dc, true, new_ctx, dc_stream,
+ &lut3d_func_new, &func_shaper_new))
+ return DC_ERROR_UNEXPECTED;
+
+ dc_stream->lut3d_func = lut3d_func_new;
+ dc_stream->func_shaper = func_shaper_new;
+
+ return DC_OK;
+}
+
+static enum dc_status
+dcn301_remove_stream_from_ctx(struct dc *dc,
+ struct dc_state *new_ctx,
+ struct dc_stream_state *dc_stream)
+{
+ struct dc_3dlut *lut3d_func;
+ struct dc_transfer_func *func_shaper;
+
+ lut3d_func = (struct dc_3dlut *)dc_stream->lut3d_func;
+ func_shaper = (struct dc_transfer_func *)dc_stream->func_shaper;
+
+ if (!dc_acquire_release_mpc_3dlut_for_ctx(dc, false, new_ctx, dc_stream,
+ &lut3d_func, &func_shaper))
+ return DC_ERROR_UNEXPECTED;
+
+ dc_stream->lut3d_func = lut3d_func;
+ dc_stream->func_shaper = func_shaper;
+
+ return dcn20_remove_stream_from_ctx(dc, new_ctx, dc_stream);
+}
static void dcn301_destroy_resource_pool(struct resource_pool **pool)
{
@@ -1406,9 +1449,9 @@ static struct resource_funcs dcn301_res_pool_funcs = {
.update_soc_for_wm_a = dcn30_update_soc_for_wm_a,
.populate_dml_pipes = dcn30_populate_dml_pipes_from_context,
.acquire_idle_pipe_for_layer = dcn20_acquire_idle_pipe_for_layer,
- .add_stream_to_ctx = dcn30_add_stream_to_ctx,
+ .add_stream_to_ctx = dcn301_add_stream_to_ctx,
.add_dsc_to_stream_resource = dcn20_add_dsc_to_stream_resource,
- .remove_stream_from_ctx = dcn20_remove_stream_from_ctx,
+ .remove_stream_from_ctx = dcn301_remove_stream_from_ctx,
.populate_dml_writeback_from_context = dcn30_populate_dml_writeback_from_context,
.set_mcif_arb_params = dcn30_set_mcif_arb_params,
.find_first_free_match_stream_enc_for_link = dcn10_find_first_free_match_stream_enc_for_link,