lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 256/917] drm/amd/display: fix null pointer deref when plugging in display
    Date
    From: Aurabindo Pillai <aurabindo.pillai@amd.com>

    [ Upstream commit 1f3b22e4eb162e0b1d423106a47484943a22a309 ]

    [Why&How]
    When system boots in headless mode, connecting a 4k display creates a
    null pointer dereference due to hubp for a certain plane being null.
    Add a condition to check for null hubp before dereferencing it.

    Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
    Reviewed-by: Harry Wentland <harry.wentland@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/dcn30/dcn30_hwseq.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c
    index fafed1e4a998d..0950784bafa49 100644
    --- a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c
    +++ b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c
    @@ -1002,7 +1002,8 @@ void dcn30_set_disp_pattern_generator(const struct dc *dc,
    /* turning off DPG */
    pipe_ctx->plane_res.hubp->funcs->set_blank(pipe_ctx->plane_res.hubp, false);
    for (mpcc_pipe = pipe_ctx->bottom_pipe; mpcc_pipe; mpcc_pipe = mpcc_pipe->bottom_pipe)
    - mpcc_pipe->plane_res.hubp->funcs->set_blank(mpcc_pipe->plane_res.hubp, false);
    + if (mpcc_pipe->plane_res.hubp)
    + mpcc_pipe->plane_res.hubp->funcs->set_blank(mpcc_pipe->plane_res.hubp, false);

    stream_res->opp->funcs->opp_set_disp_pattern_generator(stream_res->opp, test_pattern, color_space,
    color_depth, solid_color, width, height, offset);
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:34    [W:2.451 / U:0.348 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site