[PATCH 09/14] drm/amd/display: Fixed crash
Harry Wentland
harry.wentland at amd.com
Fri Dec 23 15:58:01 UTC 2016
From: Yongqiang Sun <yongqiang.sun at amd.com>
Change-Id: I921091f888efd1acd2a6d6421cf149326ebe8c17
Signed-off-by: Yongqiang Sun <yongqiang.sun 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/core/dc.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 891075e39ecf..e6010abc9e0d 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -167,24 +167,20 @@ static bool stream_adjust_vmin_vmax(struct dc *dc,
struct core_stream *core_stream = DC_STREAM_TO_CORE(stream[0]);
int i = 0;
bool ret = false;
- struct pipe_ctx *pipes;
- unsigned int underlay_idx = core_dc->res_pool->underlay_pipe_index;
for (i = 0; i < MAX_PIPES; i++) {
- if (core_dc->current_context->res_ctx.pipe_ctx[i].stream == core_stream
- && i != underlay_idx) {
+ struct pipe_ctx *pipe = &core_dc->current_context->res_ctx.pipe_ctx[i];
- pipes = &core_dc->current_context->res_ctx.pipe_ctx[i];
- core_dc->hwss.set_drr(&pipes, 1, vmin, vmax);
+ if (pipe->stream == core_stream && pipe->stream_enc) {
+ core_dc->hwss.set_drr(&pipe, 1, vmin, vmax);
/* build and update the info frame */
- resource_build_info_frame(pipes);
- core_dc->hwss.update_info_frame(pipes);
+ resource_build_info_frame(pipe);
+ core_dc->hwss.update_info_frame(pipe);
ret = true;
}
}
-
return ret;
}
--
2.9.3
More information about the amd-gfx
mailing list