Commit 091018a5 authored by Aric Cyr's avatar Aric Cyr Committed by Alex Deucher
Browse files

drm/amd/display: Triplebuffering should not be used by default 



Disable triplebuffering by default.

Signed-off-by: default avatarAric Cyr <aric.cyr@amd.com>
Acked-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ce17ce17

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

+0 −3
Original line number Diff line number Diff line
@@ -3375,9 +3375,6 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 
		goto fail;

	}



	/* No userspace support. */

	dm->dc->debug.disable_tri_buf = true;



	return 0;

fail:

	kfree(aencoder);

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

+3 −6
Original line number Diff line number Diff line
@@ -2415,8 +2415,7 @@ static void commit_planes_for_stream(struct dc *dc, 
				plane_state->triplebuffer_flips = false;

				if (update_type == UPDATE_TYPE_FAST &&

					dc->hwss.program_triplebuffer != NULL &&

					!plane_state->flip_immediate &&

					!dc->debug.disable_tri_buf) {

					!plane_state->flip_immediate && dc->debug.enable_tri_buf) {

						/*triple buffer for VUpdate  only*/

						plane_state->triplebuffer_flips = true;

				}
@@ -2443,8 +2442,7 @@ static void commit_planes_for_stream(struct dc *dc, 


			ASSERT(!pipe_ctx->plane_state->triplebuffer_flips);



			if (dc->hwss.program_triplebuffer != NULL &&

				!dc->debug.disable_tri_buf) {

			if (dc->hwss.program_triplebuffer != NULL && dc->debug.enable_tri_buf) {

				/*turn off triple buffer for full update*/

				dc->hwss.program_triplebuffer(

					dc, pipe_ctx, pipe_ctx->plane_state->triplebuffer_flips);
@@ -2509,8 +2507,7 @@ static void commit_planes_for_stream(struct dc *dc, 
				if (pipe_ctx->plane_state != plane_state)

					continue;

				/*program triple buffer after lock based on flip type*/

				if (dc->hwss.program_triplebuffer != NULL &&

					!dc->debug.disable_tri_buf) {

				if (dc->hwss.program_triplebuffer != NULL && dc->debug.enable_tri_buf) {

					/*only enable triplebuffer for  fast_update*/

					dc->hwss.program_triplebuffer(

						dc, pipe_ctx, plane_state->triplebuffer_flips);

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

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ struct dc_debug_options { 
	unsigned int force_odm_combine_4to1; //bit vector based on otg inst

#endif

	unsigned int force_fclk_khz;

	bool disable_tri_buf;

	bool enable_tri_buf;

	bool dmub_offload_enabled;

	bool dmcub_emulation;

#if defined(CONFIG_DRM_AMD_DC_DCN3_0)

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c

+6 −7
Original line number Diff line number Diff line
@@ -1642,13 +1642,12 @@ void dcn20_program_front_end_for_ctx( 
	struct dce_hwseq *hws = dc->hwseq;

	DC_LOGGER_INIT(dc->ctx->logger);



	if (dc->hwss.program_triplebuffer != NULL && dc->debug.enable_tri_buf) {

		for (i = 0; i < dc->res_pool->pipe_count; i++) {

			struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];



			if (!pipe_ctx->top_pipe && !pipe_ctx->prev_odm_pipe && pipe_ctx->plane_state) {

				ASSERT(!pipe_ctx->plane_state->triplebuffer_flips);

			if (dc->hwss.program_triplebuffer != NULL &&

				!dc->debug.disable_tri_buf) {

				/*turn off triple buffer for full update*/

				dc->hwss.program_triplebuffer(

						dc, pipe_ctx, pipe_ctx->plane_state->triplebuffer_flips);

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c

+1 −1
Original line number Diff line number Diff line
@@ -1075,7 +1075,6 @@ static const struct dc_debug_options debug_defaults_drv = { 
		.disable_pplib_wm_range = false,

		.scl_reset_length10 = true,

		.sanity_checks = false,

		.disable_tri_buf = true,

		.underflow_assert_delay_us = 0xFFFFFFFF,

};
@@ -1092,6 +1091,7 @@ static const struct dc_debug_options debug_defaults_diags = { 
		.disable_stutter = true,

		.scl_reset_length10 = true,

		.underflow_assert_delay_us = 0xFFFFFFFF,

		.enable_tri_buf = true,

};



void dcn20_dpp_destroy(struct dpp **dpp)