drm/msm/dpu: move intf and wb assignment to dpu_encoder_setup_display()

intf and wb resources are not dependent on the rm global
state so need not be allocated during dpu_encoder_virt_atomic_mode_set().

Move the allocation of intf and wb resources to dpu_encoder_setup_display()
so that we can utilize the hw caps even during atomic_check() phase.

Since dpu_encoder_setup_display() already has protection against
setting invalid intf_idx and wb_idx, these checks can now
be dropped as well.

changes in v2:
	- add phys->hw_intf and phys->hw_wb checks back

changes in v3:
	- correct the Fixes tag

Fixes: e02a559a720f ("drm/msm/dpu: make changes to dpu_encoder to support virtual encoder")
Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/489885/
Link: https://lore.kernel.org/r/1655406084-17407-1-git-send-email-quic_abhinavk@quicinc.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 5ccaf35929a0e628d6711dc235dc77044a1c5408..d61874b069c32c6128914afd09143c2008a509e5 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -1047,24 +1047,6 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc,
                phys->hw_pp = dpu_enc->hw_pp[i];
                phys->hw_ctl = to_dpu_hw_ctl(hw_ctl[i]);
 
-               if (phys->intf_idx >= INTF_0 && phys->intf_idx < INTF_MAX)
-                       phys->hw_intf = dpu_rm_get_intf(&dpu_kms->rm, phys->intf_idx);
-
-               if (phys->wb_idx >= WB_0 && phys->wb_idx < WB_MAX)
-                       phys->hw_wb = dpu_rm_get_wb(&dpu_kms->rm, phys->wb_idx);
-
-               if (!phys->hw_intf && !phys->hw_wb) {
-                       DPU_ERROR_ENC(dpu_enc,
-                                     "no intf or wb block assigned at idx: %d\n", i);
-                       return;
-               }
-
-               if (phys->hw_intf && phys->hw_wb) {
-                       DPU_ERROR_ENC(dpu_enc,
-                                       "invalid phys both intf and wb block at idx: %d\n", i);
-                       return;
-               }
-
                phys->cached_mode = crtc_state->adjusted_mode;
                if (phys->ops.atomic_mode_set)
                        phys->ops.atomic_mode_set(phys, crtc_state, conn_state);
@@ -2289,7 +2271,25 @@ static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc,
                struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];
                atomic_set(&phys->vsync_cnt, 0);
                atomic_set(&phys->underrun_cnt, 0);
+
+               if (phys->intf_idx >= INTF_0 && phys->intf_idx < INTF_MAX)
+                       phys->hw_intf = dpu_rm_get_intf(&dpu_kms->rm, phys->intf_idx);
+
+               if (phys->wb_idx >= WB_0 && phys->wb_idx < WB_MAX)
+                       phys->hw_wb = dpu_rm_get_wb(&dpu_kms->rm, phys->wb_idx);
+
+               if (!phys->hw_intf && !phys->hw_wb) {
+                       DPU_ERROR_ENC(dpu_enc, "no intf or wb block assigned at idx: %d\n", i);
+                       ret = -EINVAL;
+               }
+
+               if (phys->hw_intf && phys->hw_wb) {
+                       DPU_ERROR_ENC(dpu_enc,
+                                       "invalid phys both intf and wb block at idx: %d\n", i);
+                       ret = -EINVAL;
+               }
        }
+
        mutex_unlock(&dpu_enc->enc_lock);
 
        return ret;