Commit b8272241 authored by Rodrigo Siqueira's avatar Rodrigo Siqueira Committed by Alex Deucher
Browse files

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: default avatarHarry Wentland <Harry.Wentland@amd.com>
Acked-by: default avatarQingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2820433b

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+3 −3
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/amd/display/dc/core/dc.c

+0 −47
Original line number Diff line number Diff line
@@ -2061,53 +2061,6 @@ enum dc_status dc_commit_streams(struct dc *dc, 
	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,

drivers/gpu/drm/amd/display/dc/dc.h

+0 −4
Original line number Diff line number Diff line
@@ -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);