drm/amd/display: Copy DC context in the commit streams

DC adds an instance of DML (which contains VBA) to each context, and
multiple threads might write back to the global VBA resulting in data
overwriting. To keep the consistency with other parts of the DC code,
this commit changes dc_commit_streams to copy the current DC state, and
as a result, it also changes the function signature to expect streams
instead of a context.

Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Co-developed-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 5d9e9e8f87d3a66259d6439281804d78cb15c4bb..af81c28357380f1a47c0a2b9189c21909984405c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1890,23 +1890,44 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *c
        return result;
 }
 
-enum dc_status dc_commit_streams(struct dc *dc, struct dc_state *context)
+/**
+ * dc_commit_streams - Commit current stream state
+ *
+ * @dc: DC object with the commit state to be configured in the hardware
+ * @streams: Array with a list of stream state
+ * @stream_count: Total of streams
+ *
+ * Function responsible for commit streams change to the hardware.
+ *
+ * Return:
+ * Return DC_OK if everything work as expected, otherwise, return a dc_status
+ * code.
+ */
+enum dc_status dc_commit_streams(struct dc *dc,
+                                struct dc_stream_state *streams[],
+                                uint8_t stream_count)
 {
-       enum dc_status res = DC_OK;
        int i;
+       struct dc_state *context;
+       enum dc_status res = DC_OK;
 
-       if (!streams_changed(dc, context->streams, context->stream_count))
+       if (!streams_changed(dc, streams, stream_count))
                return res;
 
-       DC_LOG_DC("%s: %d streams\n",
-                               __func__, context->stream_count);
+       DC_LOG_DC("%s: %d streams\n", __func__, stream_count);
 
-       for (i = 0; i < context->stream_count; i++) {
-               struct dc_stream_state *stream = context->streams[i];
+       for (i = 0; i < stream_count; i++) {
+               struct dc_stream_state *stream = streams[i];
 
                dc_stream_log(dc, stream);
        }
 
+       context = dc_create_state(dc);
+       if (!context)
+               goto context_alloc_fail;
+
+       dc_resource_state_copy_construct_current(dc, context);
+
        /*
         * Previous validation was perfomred with fast_validation = true and
         * the full DML state required for hardware programming was skipped.
@@ -1922,6 +1943,10 @@ enum dc_status dc_commit_streams(struct dc *dc, struct dc_state *context)
 
        res = dc_commit_state_no_check(dc, context);
 
+context_alloc_fail:
+
+       DC_LOG_DC("%s Finished.\n", __func__);
+
        return (res == DC_OK);
 }
 
@@ -1937,7 +1962,7 @@ bool dc_commit_state(struct dc *dc, struct dc_state *context)
         * we get more confident about this change we'll need to enable
         * the new sequence for all ASICs. */
        if (dc->ctx->dce_version >= DCN_VERSION_3_2) {
-               result = dc_commit_streams(dc, context);
+               result = dc_commit_streams(dc, context->streams, context->stream_count);
                return result == DC_OK;
        }
 

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 2e71781f155b1218a376a12f4b3a1c1513bfe5fd..6adecb62e534e43165054a00b06b4146f8c538b0 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -1321,7 +1321,9 @@ void dc_resource_state_destruct(struct dc_state *context);
 
 bool dc_resource_is_dsc_encoding_supported(const struct dc *dc);
 
-enum dc_status dc_commit_streams(struct dc *dc, struct dc_state *context);
+enum dc_status dc_commit_streams(struct dc *dc,
+                                struct dc_stream_state *streams[],
+                                uint8_t stream_count);
 
 /* TODO: When the transition to the new commit sequence is done, remove this
  * function in favor of dc_commit_streams. */