diff options
| author | Jeykumar Sankaran | 2019-02-14 02:19:12 +0100 |
|---|---|---|
| committer | Rob Clark | 2019-04-18 19:04:10 +0200 |
| commit | a7fcc3237f31a4e206953bb73cf41bd429442f09 (patch) | |
| tree | 5e18f066db1c83a9b60d53aa734fad191752c23a /drivers/gpu/drm/msm/disp/dpu1 | |
| parent | drm/msm/dpu: remove phys_vid subclass (diff) | |
| download | kernel-qcow2-linux-a7fcc3237f31a4e206953bb73cf41bd429442f09.tar.gz kernel-qcow2-linux-a7fcc3237f31a4e206953bb73cf41bd429442f09.tar.xz kernel-qcow2-linux-a7fcc3237f31a4e206953bb73cf41bd429442f09.zip | |
drm/msm/dpu: release resources on modeset failure
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>
Diffstat (limited to 'drivers/gpu/drm/msm/disp/dpu1')
| -rw-r--r-- | drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 7 |
1 files 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 c51bc0fdd9c3..7d7779d70145 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -1026,13 +1026,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]; @@ -1045,6 +1045,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) |