hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/amd/display: Use same wait mpcc idle function. 

There is already wait mpcc idle function. It is better
to use the same function for all wait mpcc idle.

Signed-off-by: Yongqiang Sun <yongqiang.sun@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Yongqiang Sun 2017-11-15 16:12:19 -05:00 committed by Alex Deucher
parent 49fac0b46a
commit 1ccda80ff4
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
View File

@ -592,19 +592,13 @@ static void plane_atomic_disconnect(struct dc *dc, struct pipe_ctx *pipe_ctx)
return; return;
mpc->funcs->remove_mpcc(mpc, mpc_tree_params, mpcc_to_remove); mpc->funcs->remove_mpcc(mpc, mpc_tree_params, mpcc_to_remove);
dc->res_pool->opps[opp_id]->mpcc_disconnect_pending[fe_idx] = true;
if (hubp->funcs->hubp_disconnect) if (hubp->funcs->hubp_disconnect)
hubp->funcs->hubp_disconnect(hubp); hubp->funcs->hubp_disconnect(hubp);
if (dc->debug.sanity_checks) if (dc->debug.sanity_checks)
dcn10_verify_allow_pstate_change_high(dc); dcn10_verify_allow_pstate_change_high(dc);
pipe_ctx->stream = NULL;
memset(&pipe_ctx->stream_res, 0, sizeof(pipe_ctx->stream_res));
memset(&pipe_ctx->plane_res, 0, sizeof(pipe_ctx->plane_res));
pipe_ctx->top_pipe = NULL;
pipe_ctx->bottom_pipe = NULL;
pipe_ctx->plane_state = NULL;
} }
static void plane_atomic_power_down(struct dc *dc, int fe_idx) static void plane_atomic_power_down(struct dc *dc, int fe_idx)
@ -633,16 +627,9 @@ static void plane_atomic_disable(struct dc *dc, struct pipe_ctx *pipe_ctx)
int fe_idx = pipe_ctx->pipe_idx; int fe_idx = pipe_ctx->pipe_idx;
struct dce_hwseq *hws = dc->hwseq; struct dce_hwseq *hws = dc->hwseq;
struct hubp *hubp = dc->res_pool->hubps[fe_idx]; struct hubp *hubp = dc->res_pool->hubps[fe_idx];
struct mpc *mpc = dc->res_pool->mpc;
int opp_id = hubp->opp_id; int opp_id = hubp->opp_id;
struct output_pixel_processor *opp;
if (opp_id != 0xf) { dc->hwss.wait_for_mpcc_disconnect(dc, dc->res_pool, pipe_ctx);
mpc->funcs->wait_for_idle(mpc, hubp->mpcc_id);
opp = dc->res_pool->opps[hubp->opp_id];
opp->mpcc_disconnect_pending[hubp->mpcc_id] = false;
hubp->funcs->set_blank(hubp, true);
}
REG_UPDATE(HUBP_CLK_CNTL[fe_idx], REG_UPDATE(HUBP_CLK_CNTL[fe_idx],
HUBP_CLOCK_ENABLE, 0); HUBP_CLOCK_ENABLE, 0);
@ -656,6 +643,13 @@ static void plane_atomic_disable(struct dc *dc, struct pipe_ctx *pipe_ctx)
hubp->power_gated = true; hubp->power_gated = true;
plane_atomic_power_down(dc, fe_idx); plane_atomic_power_down(dc, fe_idx);
pipe_ctx->stream = NULL;
memset(&pipe_ctx->stream_res, 0, sizeof(pipe_ctx->stream_res));
memset(&pipe_ctx->plane_res, 0, sizeof(pipe_ctx->plane_res));
pipe_ctx->top_pipe = NULL;
pipe_ctx->bottom_pipe = NULL;
pipe_ctx->plane_state = NULL;
} }
static void dcn10_disable_plane(struct dc *dc, struct pipe_ctx *pipe_ctx) static void dcn10_disable_plane(struct dc *dc, struct pipe_ctx *pipe_ctx)
@ -758,6 +752,9 @@ static void dcn10_init_hw(struct dc *dc)
hubp->opp_id = dc->res_pool->mpc->funcs->get_opp_id(dc->res_pool->mpc, i); hubp->opp_id = dc->res_pool->mpc->funcs->get_opp_id(dc->res_pool->mpc, i);
hubp->power_gated = false; hubp->power_gated = false;
if (hubp->opp_id != 0xf)
pipe_ctx->stream_res.opp = dc->res_pool->opps[hubp->opp_id];
plane_atomic_disconnect(dc, pipe_ctx); plane_atomic_disconnect(dc, pipe_ctx);
} }