From: Tony Cheng <tony.cheng@amd.com>
Date: Tue, 6 Dec 2016 22:12:09 -0500
Subject: drm/amd/display: fix indexing bug
Git-commit: edbd58af6998217c5c1ab91cb6ca239c607cc9e0
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166
- is_new_pipe_surface should be addressed with pipe idx, not surface idx
Signed-off-by: Tony Cheng <tony.cheng@amd.com>
Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
drivers/gpu/drm/amd/display/dc/core/dc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1334,7 +1334,7 @@ void dc_update_surfaces_for_target(struc
struct core_dc *core_dc = DC_TO_CORE(dc);
struct validate_context *context = core_dc->temp_flip_context;
int i, j;
- bool is_new_pipe_surface[MAX_SURFACES];
+ bool is_new_pipe_surface[MAX_PIPES];
const struct dc_surface *new_surfaces[MAX_SURFACES] = { 0 };
update_surface_trace(dc, updates, surface_count);
@@ -1353,7 +1353,7 @@ void dc_update_surfaces_for_target(struc
&context->res_ctx.pipe_ctx[cur_pipe->bottom_pipe->pipe_idx];
}
- for (j = 0; j < MAX_SURFACES; j++)
+ for (j = 0; j < MAX_PIPES; j++)
is_new_pipe_surface[j] = true;
for (i = 0 ; i < surface_count; i++) {
@@ -1364,7 +1364,7 @@ void dc_update_surfaces_for_target(struc
struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j];
if (surface == pipe_ctx->surface)
- is_new_pipe_surface[i] = false;
+ is_new_pipe_surface[j] = false;
}
}