lkml.org 
[lkml]   [2019]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 048/100] drm/amd/display: fix odm combine pipe reset
    Date
    From: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>

    [ Upstream commit f25f06b67ba237b76092a6fc522b1a94e84bfa85 ]

    We fail to reset the second odm combine pipe. This change fixes
    odm pointer management.

    Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
    Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
    Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
    index d440b28ee43fb..6896d69b8c240 100644
    --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
    +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
    @@ -1399,9 +1399,9 @@ bool dc_remove_plane_from_context(
    * For head pipe detach surfaces from pipe for tail
    * pipe just zero it out
    */
    - if (!pipe_ctx->top_pipe ||
    - (!pipe_ctx->top_pipe->top_pipe &&
    + if (!pipe_ctx->top_pipe || (!pipe_ctx->top_pipe->top_pipe &&
    pipe_ctx->top_pipe->stream_res.opp != pipe_ctx->stream_res.opp)) {
    + pipe_ctx->top_pipe = NULL;
    pipe_ctx->plane_state = NULL;
    pipe_ctx->bottom_pipe = NULL;
    } else {
    @@ -1803,8 +1803,6 @@ enum dc_status dc_remove_stream_from_ctx(
    dc->res_pool->funcs->remove_stream_from_ctx(dc, new_ctx, stream);

    memset(del_pipe, 0, sizeof(*del_pipe));
    -
    - break;
    }
    }

    --
    2.20.1
    \
     
     \ /
      Last update: 2019-10-19 00:21    [W:4.034 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site