drm/msm/dpu: reserve CDM blocks for DP if mode is YUV420

Reserve CDM blocks for DP if the mode format is YUV420. Currently this
reservation only works for writeback and DP if the format is YUV420. But
this can be easily extented to other YUV formats for DP.

Changes in v2:
	- Minor code simplification

Signed-off-by: Paloma Arellano <quic_parellan@quicinc.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/579630/
Link: https://lore.kernel.org/r/20240222194025.25329-19-quic_parellan@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 978dd4ef6b72a0beba273f05dd0379d6e2b8df43..a0df4fa3871f5b9e7c117c0ddb3516f94292638a 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -635,6 +635,7 @@ static int dpu_encoder_virt_atomic_check(
        struct dpu_kms *dpu_kms;
        struct drm_display_mode *adj_mode;
        struct msm_display_topology topology;
+       struct msm_display_info *disp_info;
        struct dpu_global_state *global_state;
        struct drm_framebuffer *fb;
        struct drm_dsc_config *dsc;
@@ -650,6 +651,7 @@ static int dpu_encoder_virt_atomic_check(
        DPU_DEBUG_ENC(dpu_enc, "\n");
 
        priv = drm_enc->dev->dev_private;
+       disp_info = &dpu_enc->disp_info;
        dpu_kms = to_dpu_kms(priv->kms);
        adj_mode = &crtc_state->adjusted_mode;
        global_state = dpu_kms_get_global_state(crtc_state->state);
@@ -663,21 +665,24 @@ static int dpu_encoder_virt_atomic_check(
        topology = dpu_encoder_get_topology(dpu_enc, dpu_kms, adj_mode, crtc_state, dsc);
 
        /*
-        * Use CDM only for writeback at the moment as other interfaces cannot handle it.
-        * if writeback itself cannot handle cdm for some reason it will fail in its atomic_check()
+        * Use CDM only for writeback or DP at the moment as other interfaces cannot handle it.
+        * If writeback itself cannot handle cdm for some reason it will fail in its atomic_check()
         * earlier.
         */
-       if (dpu_enc->disp_info.intf_type == INTF_WB && conn_state->writeback_job) {
+       if (disp_info->intf_type == INTF_WB && conn_state->writeback_job) {
                fb = conn_state->writeback_job->fb;
 
                if (fb && DPU_FORMAT_IS_YUV(to_dpu_format(msm_framebuffer_format(fb))))
                        topology.needs_cdm = true;
-               if (topology.needs_cdm && !dpu_enc->cur_master->hw_cdm)
-                       crtc_state->mode_changed = true;
-               else if (!topology.needs_cdm && dpu_enc->cur_master->hw_cdm)
-                       crtc_state->mode_changed = true;
+       } else if (disp_info->intf_type == INTF_DP) {
+               if (msm_dp_is_yuv_420_enabled(priv->dp[disp_info->h_tile_instance[0]], adj_mode))
+                       topology.needs_cdm = true;
        }
 
+       if (topology.needs_cdm && !dpu_enc->cur_master->hw_cdm)
+               crtc_state->mode_changed = true;
+       else if (!topology.needs_cdm && dpu_enc->cur_master->hw_cdm)
+               crtc_state->mode_changed = true;
        /*
         * Release and Allocate resources on every modeset
         * Dont allocate when active is false.
@@ -1149,7 +1154,8 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc,
 
        dpu_enc->dsc_mask = dsc_mask;
 
-       if (dpu_enc->disp_info.intf_type == INTF_WB && conn_state->writeback_job) {
+       if ((dpu_enc->disp_info.intf_type == INTF_WB && conn_state->writeback_job) ||
+           dpu_enc->disp_info.intf_type == INTF_DP) {
                struct dpu_hw_blk *hw_cdm = NULL;
 
                dpu_rm_get_assigned_resources(&dpu_kms->rm, global_state,