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

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
...@@ -3375,9 +3375,6 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) ...@@ -3375,9 +3375,6 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
goto fail; goto fail;
} }
/* No userspace support. */
dm->dc->debug.disable_tri_buf = true;
return 0; return 0;
fail: fail:
kfree(aencoder); kfree(aencoder);
......
...@@ -2415,8 +2415,7 @@ static void commit_planes_for_stream(struct dc *dc, ...@@ -2415,8 +2415,7 @@ static void commit_planes_for_stream(struct dc *dc,
plane_state->triplebuffer_flips = false; plane_state->triplebuffer_flips = false;
if (update_type == UPDATE_TYPE_FAST && if (update_type == UPDATE_TYPE_FAST &&
dc->hwss.program_triplebuffer != NULL && dc->hwss.program_triplebuffer != NULL &&
!plane_state->flip_immediate && !plane_state->flip_immediate && dc->debug.enable_tri_buf) {
!dc->debug.disable_tri_buf) {
/*triple buffer for VUpdate only*/ /*triple buffer for VUpdate only*/
plane_state->triplebuffer_flips = true; plane_state->triplebuffer_flips = true;
} }
...@@ -2443,8 +2442,7 @@ static void commit_planes_for_stream(struct dc *dc, ...@@ -2443,8 +2442,7 @@ static void commit_planes_for_stream(struct dc *dc,
ASSERT(!pipe_ctx->plane_state->triplebuffer_flips); ASSERT(!pipe_ctx->plane_state->triplebuffer_flips);
if (dc->hwss.program_triplebuffer != NULL && if (dc->hwss.program_triplebuffer != NULL && dc->debug.enable_tri_buf) {
!dc->debug.disable_tri_buf) {
/*turn off triple buffer for full update*/ /*turn off triple buffer for full update*/
dc->hwss.program_triplebuffer( dc->hwss.program_triplebuffer(
dc, pipe_ctx, pipe_ctx->plane_state->triplebuffer_flips); dc, pipe_ctx, pipe_ctx->plane_state->triplebuffer_flips);
...@@ -2509,8 +2507,7 @@ static void commit_planes_for_stream(struct dc *dc, ...@@ -2509,8 +2507,7 @@ static void commit_planes_for_stream(struct dc *dc,
if (pipe_ctx->plane_state != plane_state) if (pipe_ctx->plane_state != plane_state)
continue; continue;
/*program triple buffer after lock based on flip type*/ /*program triple buffer after lock based on flip type*/
if (dc->hwss.program_triplebuffer != NULL && if (dc->hwss.program_triplebuffer != NULL && dc->debug.enable_tri_buf) {
!dc->debug.disable_tri_buf) {
/*only enable triplebuffer for fast_update*/ /*only enable triplebuffer for fast_update*/
dc->hwss.program_triplebuffer( dc->hwss.program_triplebuffer(
dc, pipe_ctx, plane_state->triplebuffer_flips); dc, pipe_ctx, plane_state->triplebuffer_flips);
......
...@@ -476,7 +476,7 @@ struct dc_debug_options { ...@@ -476,7 +476,7 @@ struct dc_debug_options {
unsigned int force_odm_combine_4to1; //bit vector based on otg inst unsigned int force_odm_combine_4to1; //bit vector based on otg inst
#endif #endif
unsigned int force_fclk_khz; unsigned int force_fclk_khz;
bool disable_tri_buf; bool enable_tri_buf;
bool dmub_offload_enabled; bool dmub_offload_enabled;
bool dmcub_emulation; bool dmcub_emulation;
#if defined(CONFIG_DRM_AMD_DC_DCN3_0) #if defined(CONFIG_DRM_AMD_DC_DCN3_0)
......
...@@ -1642,13 +1642,12 @@ void dcn20_program_front_end_for_ctx( ...@@ -1642,13 +1642,12 @@ void dcn20_program_front_end_for_ctx(
struct dce_hwseq *hws = dc->hwseq; struct dce_hwseq *hws = dc->hwseq;
DC_LOGGER_INIT(dc->ctx->logger); 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++) { for (i = 0; i < dc->res_pool->pipe_count; i++) {
struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[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) { if (!pipe_ctx->top_pipe && !pipe_ctx->prev_odm_pipe && pipe_ctx->plane_state) {
ASSERT(!pipe_ctx->plane_state->triplebuffer_flips); 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*/ /*turn off triple buffer for full update*/
dc->hwss.program_triplebuffer( dc->hwss.program_triplebuffer(
dc, pipe_ctx, pipe_ctx->plane_state->triplebuffer_flips); dc, pipe_ctx, pipe_ctx->plane_state->triplebuffer_flips);
......
...@@ -1075,7 +1075,6 @@ static const struct dc_debug_options debug_defaults_drv = { ...@@ -1075,7 +1075,6 @@ static const struct dc_debug_options debug_defaults_drv = {
.disable_pplib_wm_range = false, .disable_pplib_wm_range = false,
.scl_reset_length10 = true, .scl_reset_length10 = true,
.sanity_checks = false, .sanity_checks = false,
.disable_tri_buf = true,
.underflow_assert_delay_us = 0xFFFFFFFF, .underflow_assert_delay_us = 0xFFFFFFFF,
}; };
...@@ -1092,6 +1091,7 @@ static const struct dc_debug_options debug_defaults_diags = { ...@@ -1092,6 +1091,7 @@ static const struct dc_debug_options debug_defaults_diags = {
.disable_stutter = true, .disable_stutter = true,
.scl_reset_length10 = true, .scl_reset_length10 = true,
.underflow_assert_delay_us = 0xFFFFFFFF, .underflow_assert_delay_us = 0xFFFFFFFF,
.enable_tri_buf = true,
}; };
void dcn20_dpp_destroy(struct dpp **dpp) void dcn20_dpp_destroy(struct dpp **dpp)
......
...@@ -894,6 +894,8 @@ static const struct dc_debug_options debug_defaults_diags = { ...@@ -894,6 +894,8 @@ static const struct dc_debug_options debug_defaults_diags = {
.disable_pplib_wm_range = true, .disable_pplib_wm_range = true,
.disable_stutter = true, .disable_stutter = true,
.disable_48mhz_pwrdwn = true, .disable_48mhz_pwrdwn = true,
.disable_psr = true,
.enable_tri_buf = true
}; };
enum dcn20_clk_src_array_id { enum dcn20_clk_src_array_id {
......
...@@ -865,6 +865,7 @@ static const struct dc_debug_options debug_defaults_diags = { ...@@ -865,6 +865,7 @@ static const struct dc_debug_options debug_defaults_diags = {
.scl_reset_length10 = true, .scl_reset_length10 = true,
.dwb_fi_phase = -1, // -1 = disable .dwb_fi_phase = -1, // -1 = disable
.dmub_command_table = true, .dmub_command_table = true,
.enable_tri_buf = true,
}; };
void dcn30_dpp_destroy(struct dpp **dpp) void dcn30_dpp_destroy(struct dpp **dpp)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment