[PATCH 54/73] drm/amd/display: Fix unbalanced locking in surface apply

[Harry Wentland]

From: Roman Li <roman...@amd.com>

also simplifying syntax and removing unused variable in
dce110_apply_ctx_for_surface()

Change-Id: I15c39de23afa05635d537ab2c5f8385342f75a64
Signed-off-by: Roman Li <roman...@amd.com>
Reviewed-by: Tony Cheng <tony.ch...@amd.com>
Acked-by: Harry Wentland <harry.wentl...@amd.com>
---
 drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c 
b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
index 28c977f49773..ee3b9441e460 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -2847,22 +2847,19 @@ static void dce110_apply_ctx_for_surface(
                int num_planes,
                struct dc_state *context)
 {
-       int i, be_idx;
+       int i;
 
        if (num_planes == 0)
                return;
 
-       be_idx = -1;
        for (i = 0; i < dc->res_pool->pipe_count; i++) {
                struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];
                struct pipe_ctx *old_pipe_ctx = 
&dc->current_state->res_ctx.pipe_ctx[i];
 
-               if (stream == context->res_ctx.pipe_ctx[i].stream) {
-                       be_idx = 
context->res_ctx.pipe_ctx[i].stream_res.tg->inst;
+               if (stream == pipe_ctx->stream) {
                        if (!pipe_ctx->top_pipe &&
                                (pipe_ctx->plane_state || 
old_pipe_ctx->plane_state))
                                dc->hwss.pipe_control_lock(dc, pipe_ctx, true);
-                       break;
                }
        }
 
-- 
2.14.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx