diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3118-drm-amd-display-Check-opplist-in-pipe-ctx-not-in-res.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3118-drm-amd-display-Check-opplist-in-pipe-ctx-not-in-res.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3118-drm-amd-display-Check-opplist-in-pipe-ctx-not-in-res.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3118-drm-amd-display-Check-opplist-in-pipe-ctx-not-in-res.patch new file mode 100644 index 00000000..fd632452 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3118-drm-amd-display-Check-opplist-in-pipe-ctx-not-in-res.patch @@ -0,0 +1,60 @@ +From 848b7b61ff44c9554a0cb05c73f0a5a03df6be72 Mon Sep 17 00:00:00 2001 +From: Yongqiang Sun <yongqiang.sun@amd.com> +Date: Thu, 21 Dec 2017 15:38:31 -0500 +Subject: [PATCH 3118/4131] drm/amd/display: Check opplist in pipe ctx not in + res pool. + +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> +--- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 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 5f9094c..4fedd7b 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 +@@ -600,13 +600,13 @@ static void plane_atomic_disconnect(struct dc *dc, struct pipe_ctx *pipe_ctx) + struct hubp *hubp = pipe_ctx->plane_res.hubp; + int dpp_id = pipe_ctx->plane_res.dpp->inst; + struct mpc *mpc = dc->res_pool->mpc; +- int opp_id; ++ int pipe_idx; + struct mpc_tree *mpc_tree_params; + struct mpcc *mpcc_to_remove = NULL; + + /* look at tree rather than mi here to know if we already reset */ +- for (opp_id = 0; opp_id < dc->res_pool->pipe_count; opp_id++) { +- struct output_pixel_processor *opp = dc->res_pool->opps[opp_id]; ++ for (pipe_idx = 0; pipe_idx < dc->res_pool->pipe_count; pipe_idx++) { ++ struct output_pixel_processor *opp = dc->res_pool->opps[pipe_idx]; + + mpc_tree_params = &(opp->mpc_tree_params); + mpcc_to_remove = mpc->funcs->get_mpcc_for_dpp(mpc_tree_params, dpp_id); +@@ -615,11 +615,11 @@ static void plane_atomic_disconnect(struct dc *dc, struct pipe_ctx *pipe_ctx) + } + + /*Already reset*/ +- if (opp_id == dc->res_pool->pipe_count) ++ if (pipe_idx == dc->res_pool->pipe_count) + return; + + mpc->funcs->remove_mpcc(mpc, mpc_tree_params, mpcc_to_remove); +- dc->res_pool->opps[opp_id]->mpcc_disconnect_pending[pipe_ctx->plane_res.mpcc_inst] = true; ++ dc->res_pool->opps[pipe_idx]->mpcc_disconnect_pending[pipe_ctx->plane_res.mpcc_inst] = true; + + dc->optimized_required = true; + +@@ -665,7 +665,7 @@ static void plane_atomic_disable(struct dc *dc, struct pipe_ctx *pipe_ctx) + REG_UPDATE(DPP_CONTROL[dpp_id], + DPP_CLOCK_ENABLE, 0); + +- if (opp_id != 0xf && dc->res_pool->opps[opp_id]->mpc_tree_params.opp_list == NULL) ++ if (opp_id != 0xf && pipe_ctx->stream_res.opp->mpc_tree_params.opp_list == NULL) + REG_UPDATE(OPP_PIPE_CONTROL[opp_id], + OPP_PIPE_CLOCK_EN, 0); + +-- +2.7.4 + |