Return immediately on failure, this will make dpu reservations
part look cleaner.

Signed-off-by: Kalyan Thota <quic_kaly...@quicinc.com>
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c 
b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 46d2a5c..3920efd 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -636,25 +636,22 @@ static int dpu_encoder_virt_atomic_check(
                if (ret) {
                        DPU_ERROR_ENC(dpu_enc,
                                        "mode unsupported, phys idx %d\n", i);
-                       break;
+                       return ret;
                }
        }
 
        topology = dpu_encoder_get_topology(dpu_enc, dpu_kms, adj_mode, 
crtc_state);
 
-       /* Reserve dynamic resources now. */
-       if (!ret) {
-               /*
-                * Release and Allocate resources on every modeset
-                * Dont allocate when active is false.
-                */
-               if (drm_atomic_crtc_needs_modeset(crtc_state)) {
-                       dpu_rm_release(global_state, drm_enc);
+       /*
+        * Release and Allocate resources on every modeset
+        * Dont allocate when active is false.
+        */
+       if (drm_atomic_crtc_needs_modeset(crtc_state)) {
+               dpu_rm_release(global_state, drm_enc);
 
-                       if (!crtc_state->active_changed || crtc_state->active)
-                               ret = dpu_rm_reserve(&dpu_kms->rm, global_state,
-                                               drm_enc, crtc_state, topology);
-               }
+               if (!crtc_state->active_changed || crtc_state->active)
+                       ret = dpu_rm_reserve(&dpu_kms->rm, global_state,
+                                       drm_enc, crtc_state, topology);
        }
 
        trace_dpu_enc_atomic_check_flags(DRMID(drm_enc), adj_mode->flags);
-- 
2.7.4

Reply via email to