drm/amd/display: Drop dc_commit_state in favor of dc_commit_streams

[Why & How]
There are two functions responsible for handling the DC commit state:
dc_commit_state and dc_commit_streams. Both have the same goal, but
dc_commit_streams surpess dc_commit_state in terms of completeness. For
this reason, maintaining these two functions makes maintainability
unnecessarily complicated. This commit replaces the old dc_commit_state
in favor of dc_commit_streams, and removes the old dc_commit_state.

Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 26abb62bbd93b8f618dccf1d795a8452cc4c579f..0d0d2f8b4e3b612c9610af0b08ca1878e37f290b 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2486,7 +2486,7 @@ static enum dc_status amdgpu_dm_commit_zero_streams(struct dc *dc)
                        goto fail;
        }
 
-       res = dc_commit_state(dc, context);
+       res = dc_commit_streams(dc, context->streams, context->stream_count);
 
 fail:
        dc_release_state(context);
@@ -2745,7 +2745,7 @@ static int dm_resume(void *handle)
                        dc_enable_dmub_outbox(adev->dm.dc);
                }
 
-               WARN_ON(!dc_commit_state(dm->dc, dc_state));
+               WARN_ON(!dc_commit_streams(dm->dc, dc_state->streams, dc_state->stream_count));
 
                dm_gpureset_commit_state(dm->cached_dc_state, dm);
 
@@ -8482,7 +8482,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
 
                dm_enable_per_frame_crtc_master_sync(dc_state);
                mutex_lock(&dm->dc_lock);
-               WARN_ON(!dc_commit_state(dm->dc, dc_state));
+               WARN_ON(!dc_commit_streams(dm->dc, dc_state->streams, dc_state->stream_count));
 
                /* Allow idle optimization when vblank count is 0 for display off */
                if (dm->active_vblank_irq_count == 0)

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 4ac11f16911913a06f9ef380dc0cf88a4a77b119..a5f2f880610d58c593bb64edc7cdb62f66c3883d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -2061,53 +2061,6 @@ context_alloc_fail:
        return res;
 }
 
-/* TODO: When the transition to the new commit sequence is done, remove this
- * function in favor of dc_commit_streams. */
-bool dc_commit_state(struct dc *dc, struct dc_state *context)
-{
-       enum dc_status result = DC_ERROR_UNEXPECTED;
-       int i;
-
-       /* TODO: Since change commit sequence can have a huge impact,
-        * we decided to only enable it for DCN3x. However, as soon as
-        * 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->streams, context->stream_count);
-               return result == DC_OK;
-       }
-
-       if (!streams_changed(dc, context->streams, context->stream_count)) {
-               return DC_OK;
-       }
-
-       DC_LOG_DC("%s: %d streams\n",
-                               __func__, context->stream_count);
-
-       for (i = 0; i < context->stream_count; i++) {
-               struct dc_stream_state *stream = context->streams[i];
-
-               dc_stream_log(dc, stream);
-       }
-
-       /*
-        * Previous validation was perfomred with fast_validation = true and
-        * the full DML state required for hardware programming was skipped.
-        *
-        * Re-validate here to calculate these parameters / watermarks.
-        */
-       result = dc_validate_global_state(dc, context, false);
-       if (result != DC_OK) {
-               DC_LOG_ERROR("DC commit global validation failure: %s (%d)",
-                            dc_status_to_str(result), result);
-               return result;
-       }
-
-       result = dc_commit_state_no_check(dc, context);
-
-       return (result == DC_OK);
-}
-
 bool dc_acquire_release_mpc_3dlut(
                struct dc *dc, bool acquire,
                struct dc_stream_state *stream,

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 0f6873449d15643ef42397506f23dde995338a4c..b51dfe0f507ceb27a346d34210130291fbfb8ef6 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -1360,10 +1360,6 @@ 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. */
-bool dc_commit_state(struct dc *dc, struct dc_state *context);
-
 struct dc_state *dc_create_state(struct dc *dc);
 struct dc_state *dc_copy_state(struct dc_state *src_ctx);
 void dc_retain_state(struct dc_state *context);