From: Dmytro Laktyushkin <Dmytro.Laktyushkin@xxxxxxx> Change-Id: Ic38b3c2dcb9b7e3db1e697e405fe5b7be856420f Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin at amd.com> Reviewed-by: Tony Cheng <Tony.Cheng at amd.com> Acked-by: Harry Wentland <Harry.Wentland at amd.com> --- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c index e1298d7029e6..fa19c6b92f29 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c @@ -853,8 +853,9 @@ static void plane_atomic_disable(struct core_dc *dc, struct dce_hwseq *hws = dc->hwseq; struct mem_input *mi = dc->res_pool->mis[fe_idx]; struct mpc *mpc = dc->res_pool->mpc; + int opp_id = mi->opp_id; - if (mi->opp_id == 0xf) + if (opp_id == 0xf) return; mpc->funcs->wait_for_idle(mpc, mi->mpcc_id); @@ -876,8 +877,8 @@ static void plane_atomic_disable(struct core_dc *dc, REG_UPDATE(DPP_CONTROL[fe_idx], DPP_CLOCK_ENABLE, 0); - if (dc->res_pool->opps[mi->opp_id]->mpc_tree.num_pipes == 0) - REG_UPDATE(OPP_PIPE_CONTROL[mi->opp_id], + if (dc->res_pool->opps[opp_id]->mpc_tree.num_pipes == 0) + REG_UPDATE(OPP_PIPE_CONTROL[opp_id], OPP_PIPE_CLOCK_EN, 0); if (dc->public.debug.sanity_checks) -- 2.11.0
