iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "drm/amd/display: Unblank hubp based on plane visibility"

Browse Source 
This reverts commit fd1c85d3ac2ccfec33b007399e6677b41899a888

[Why]
We are not implementing the planned new HW sequence
to disable HUBP.

[How]
Revert most related changes to minimize possibility
of regression.

Signed-off-by: Wesley Chalmers <Wesley.Chalmers@amd.com>
Reviewed-by: Martin Leung <Martin.Leung@amd.com>
Acked-by: Qingqing Zhuo <Qingqing.Zhuo@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Wesley Chalmers 2021-01-27 15:23:18 -05:00 committed by Alex Deucher
parent 292496767a
commit e7a30ade74
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/drm/amd/display/dc/basics/dc_common.c
View File

@ -49,24 +49,20 @@ bool is_rgb_cspace(enum dc_color_space output_color_space)
} }
} }
bool is_child_pipe_tree_visible(struct pipe_ctx *pipe_ctx) bool is_lower_pipe_tree_visible(struct pipe_ctx *pipe_ctx)
{ {
if (pipe_ctx->plane_state && pipe_ctx->plane_state->visible) if (pipe_ctx->plane_state && pipe_ctx->plane_state->visible)
return true; return true;
if (pipe_ctx->bottom_pipe && is_child_pipe_tree_visible(pipe_ctx->bottom_pipe)) if (pipe_ctx->bottom_pipe && is_lower_pipe_tree_visible(pipe_ctx->bottom_pipe))
return true;
if (pipe_ctx->next_odm_pipe && is_child_pipe_tree_visible(pipe_ctx->next_odm_pipe))
return true; return true;
return false; return false;
} }
bool is_parent_pipe_tree_visible(struct pipe_ctx *pipe_ctx) bool is_upper_pipe_tree_visible(struct pipe_ctx *pipe_ctx)
{ {
if (pipe_ctx->plane_state && pipe_ctx->plane_state->visible) if (pipe_ctx->plane_state && pipe_ctx->plane_state->visible)
return true; return true;
if (pipe_ctx->top_pipe && is_parent_pipe_tree_visible(pipe_ctx->top_pipe)) if (pipe_ctx->top_pipe && is_upper_pipe_tree_visible(pipe_ctx->top_pipe))
return true;
if (pipe_ctx->prev_odm_pipe && is_parent_pipe_tree_visible(pipe_ctx->prev_odm_pipe))
return true; return true;
return false; return false;
} }
@ -75,13 +71,9 @@ bool is_pipe_tree_visible(struct pipe_ctx *pipe_ctx)
{ {
if (pipe_ctx->plane_state && pipe_ctx->plane_state->visible) if (pipe_ctx->plane_state && pipe_ctx->plane_state->visible)
return true; return true;
if (pipe_ctx->top_pipe && is_parent_pipe_tree_visible(pipe_ctx->top_pipe)) if (pipe_ctx->top_pipe && is_upper_pipe_tree_visible(pipe_ctx->top_pipe))
return true; return true;
if (pipe_ctx->bottom_pipe && is_child_pipe_tree_visible(pipe_ctx->bottom_pipe)) if (pipe_ctx->bottom_pipe && is_lower_pipe_tree_visible(pipe_ctx->bottom_pipe))
return true;
if (pipe_ctx->prev_odm_pipe && is_parent_pipe_tree_visible(pipe_ctx->prev_odm_pipe))
return true;
if (pipe_ctx->next_odm_pipe && is_child_pipe_tree_visible(pipe_ctx->next_odm_pipe))
return true; return true;
return false; return false;
} }

4
drivers/gpu/drm/amd/display/dc/basics/dc_common.h
View File

@ -30,9 +30,9 @@
bool is_rgb_cspace(enum dc_color_space output_color_space); bool is_rgb_cspace(enum dc_color_space output_color_space);
bool is_child_pipe_tree_visible(struct pipe_ctx *pipe_ctx); bool is_lower_pipe_tree_visible(struct pipe_ctx *pipe_ctx);
bool is_parent_pipe_tree_visible(struct pipe_ctx *pipe_ctx); bool is_upper_pipe_tree_visible(struct pipe_ctx *pipe_ctx);
bool is_pipe_tree_visible(struct pipe_ctx *pipe_ctx); bool is_pipe_tree_visible(struct pipe_ctx *pipe_ctx);

2
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
View File

@ -1575,7 +1575,7 @@ static void dcn20_update_dchubp_dpp(
if (is_pipe_tree_visible(pipe_ctx)) if (pipe_ctx->update_flags.bits.enable)
dc->hwss.set_hubp_blank(dc, pipe_ctx, false); dc->hwss.set_hubp_blank(dc, pipe_ctx, false);
} }