lkml.org 
[lkml]   [2019]   [May]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.1 172/405] drm/msm/dpu: release resources on modeset failure
    Date
    [ Upstream commit a7fcc3237f31a4e206953bb73cf41bd429442f09 ]

    release resources allocated in mode_set if any of
    the hw check fails. Most of these checks are not
    necessary and they will be removed in the follow up
    patches with state based resource allocations.

    Signed-off-by: Jeykumar Sankaran <jsanka@codeaurora.org>
    Signed-off-by: Sean Paul <seanpaul@chromium.org>
    Link: https://patchwork.freedesktop.org/patch/msgid/1550107156-17625-4-git-send-email-jsanka@codeaurora.org
    Signed-off-by: Rob Clark <robdclark@chromium.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
    index 5aa3307f3f0c5..f59c00191a2a2 100644
    --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
    +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
    @@ -1023,13 +1023,13 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc,
    if (!dpu_enc->hw_pp[i]) {
    DPU_ERROR_ENC(dpu_enc, "no pp block assigned"
    "at idx: %d\n", i);
    - return;
    + goto error;
    }

    if (!hw_ctl[i]) {
    DPU_ERROR_ENC(dpu_enc, "no ctl block assigned"
    "at idx: %d\n", i);
    - return;
    + goto error;
    }

    phys->hw_pp = dpu_enc->hw_pp[i];
    @@ -1042,6 +1042,9 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc,
    }

    dpu_enc->mode_set_complete = true;
    +
    +error:
    + dpu_rm_release(&dpu_kms->rm, drm_enc);
    }

    static void _dpu_encoder_virt_enable_helper(struct drm_encoder *drm_enc)
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-05-30 06:52    [W:2.333 / U:0.476 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site