drm/msm/dpu: simplify intf allocation code

Rather than passing DRM_MODE_ENCODER_* and letting dpu_encoder to guess,
which intf type we mean, pass INTF_DSI/INTF_DP directly. This is
required to support HDMI output in DPU, as both DP and HDMI encoders are
DRM_MODE_ENCODER_TMDS. Thus dpu_encoder code can not make a difference
between HDMI and DP outputs.

Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Arnaud Vrac <rawoul@gmail.com>
Tested-by: Arnaud Vrac <rawoul@gmail.com>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/532370/
Link: https://lore.kernel.org/r/20230415171926.85774-2-dmitry.baryshkov@linaro.org
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 1dc5dbe..b34416c 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -495,7 +495,7 @@ void dpu_encoder_helper_split_config(
        hw_mdptop = phys_enc->hw_mdptop;
        disp_info = &dpu_enc->disp_info;
 
-       if (disp_info->intf_type != DRM_MODE_ENCODER_DSI)
+       if (disp_info->intf_type != INTF_DSI)
                return;
 
        /**
@@ -1127,7 +1127,7 @@ static void _dpu_encoder_virt_enable_helper(struct drm_encoder *drm_enc)
        }
 
 
-       if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_TMDS &&
+       if (dpu_enc->disp_info.intf_type == INTF_DP &&
                dpu_enc->cur_master->hw_mdptop &&
                dpu_enc->cur_master->hw_mdptop->ops.intf_audio_select)
                dpu_enc->cur_master->hw_mdptop->ops.intf_audio_select(
@@ -1135,7 +1135,7 @@ static void _dpu_encoder_virt_enable_helper(struct drm_encoder *drm_enc)
 
        _dpu_encoder_update_vsync_source(dpu_enc, &dpu_enc->disp_info);
 
-       if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI &&
+       if (dpu_enc->disp_info.intf_type == INTF_DSI &&
                        !WARN_ON(dpu_enc->num_phys_encs == 0)) {
                unsigned bpc = dpu_enc->connector->display_info.bpc;
                for (i = 0; i < MAX_CHANNELS_PER_ENC; i++) {
@@ -1977,7 +1977,7 @@ void dpu_encoder_kickoff(struct drm_encoder *drm_enc)
                        phys->ops.handle_post_kickoff(phys);
        }
 
-       if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI &&
+       if (dpu_enc->disp_info.intf_type == INTF_DSI &&
                        !dpu_encoder_vsync_time(drm_enc, &wakeup_time)) {
                trace_dpu_enc_early_kickoff(DRMID(drm_enc),
                                            ktime_to_ms(wakeup_time));
@@ -2182,7 +2182,7 @@ static int dpu_encoder_virt_add_phys_encs(
        }
 
 
-       if (disp_info->intf_type == DRM_MODE_ENCODER_VIRTUAL) {
+       if (disp_info->intf_type == INTF_WB) {
                enc = dpu_encoder_phys_wb_init(params);
 
                if (IS_ERR(enc)) {
@@ -2231,7 +2231,6 @@ static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc,
 {
        int ret = 0;
        int i = 0;
-       enum dpu_intf_type intf_type = INTF_NONE;
        struct dpu_enc_phys_init_params phys_params;
 
        if (!dpu_enc) {
@@ -2246,23 +2245,11 @@ static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc,
        phys_params.parent = &dpu_enc->base;
        phys_params.enc_spinlock = &dpu_enc->enc_spinlock;
 
-       switch (disp_info->intf_type) {
-       case DRM_MODE_ENCODER_DSI:
-               intf_type = INTF_DSI;
-               break;
-       case DRM_MODE_ENCODER_TMDS:
-               intf_type = INTF_DP;
-               break;
-       case DRM_MODE_ENCODER_VIRTUAL:
-               intf_type = INTF_WB;
-               break;
-       }
-
        WARN_ON(disp_info->num_of_h_tiles < 1);
 
        DPU_DEBUG("dsi_info->num_of_h_tiles %d\n", disp_info->num_of_h_tiles);
 
-       if (disp_info->intf_type != DRM_MODE_ENCODER_VIRTUAL)
+       if (disp_info->intf_type != INTF_WB)
                dpu_enc->idle_pc_supported =
                                dpu_kms->catalog->caps->has_idle_pc;
 
@@ -2290,11 +2277,11 @@ static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc,
                                i, controller_id, phys_params.split_role);
 
                phys_params.intf_idx = dpu_encoder_get_intf(dpu_kms->catalog,
-                                                                                                       intf_type,
-                                                                                                       controller_id);
+                                                           disp_info->intf_type,
+                                                           controller_id);
 
                phys_params.wb_idx = dpu_encoder_get_wb(dpu_kms->catalog,
-                               intf_type, controller_id);
+                               disp_info->intf_type, controller_id);
                /*
                 * The phys_params might represent either an INTF or a WB unit, but not
                 * both of them at the same time.
@@ -2302,14 +2289,14 @@ static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc,
                if ((phys_params.intf_idx == INTF_MAX) &&
                                (phys_params.wb_idx == WB_MAX)) {
                        DPU_ERROR_ENC(dpu_enc, "could not get intf or wb: type %d, id %d\n",
-                                                 intf_type, controller_id);
+                                                 disp_info->intf_type, controller_id);
                        ret = -EINVAL;
                }
 
                if ((phys_params.intf_idx != INTF_MAX) &&
                                (phys_params.wb_idx != WB_MAX)) {
                        DPU_ERROR_ENC(dpu_enc, "both intf and wb present: type %d, id %d\n",
-                                                 intf_type, controller_id);
+                                                 disp_info->intf_type, controller_id);
                        ret = -EINVAL;
                }
 
@@ -2409,11 +2396,11 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc,
        timer_setup(&dpu_enc->frame_done_timer,
                        dpu_encoder_frame_done_timeout, 0);
 
-       if (disp_info->intf_type == DRM_MODE_ENCODER_DSI)
+       if (disp_info->intf_type == INTF_DSI)
                timer_setup(&dpu_enc->vsync_event_timer,
                                dpu_encoder_vsync_event_handler,
                                0);
-       else if (disp_info->intf_type == DRM_MODE_ENCODER_TMDS)
+       else if (disp_info->intf_type == INTF_DP)
                dpu_enc->wide_bus_en = msm_dp_wide_bus_available(
                                priv->dp[disp_info->h_tile_instance[0]]);
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
index 2c9ef8d..6d14f84 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
@@ -21,7 +21,7 @@
 
 /**
  * struct msm_display_info - defines display properties
- * @intf_type:          DRM_MODE_ENCODER_ type
+ * @intf_type:          INTF_ type
  * @num_of_h_tiles:     Number of horizontal tiles in case of split interface
  * @h_tile_instance:    Controller instance used per tile. Number of elements is
  *                      based on num_of_h_tiles
@@ -31,7 +31,7 @@
  * @dsc:               DSC configuration data for DSC-enabled displays
  */
 struct msm_display_info {
-       int intf_type;
+       enum dpu_intf_type intf_type;
        uint32_t num_of_h_tiles;
        uint32_t h_tile_instance[MAX_H_TILES_PER_DISPLAY];
        bool is_cmd_mode;

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index 0e7a687..e85e372 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -542,7 +542,7 @@ static int _dpu_kms_initialize_dsi(struct drm_device *dev,
                }
 
                memset(&info, 0, sizeof(info));
-               info.intf_type = encoder->encoder_type;
+               info.intf_type = INTF_DSI;
 
                rc = msm_dsi_modeset_init(priv->dsi[i], dev, encoder);
                if (rc) {
@@ -605,7 +605,7 @@ static int _dpu_kms_initialize_displayport(struct drm_device *dev,
 
                info.num_of_h_tiles = 1;
                info.h_tile_instance[0] = i;
-               info.intf_type = encoder->encoder_type;
+               info.intf_type = INTF_DP;
                rc = dpu_encoder_setup(dev, encoder, &info);
                if (rc) {
                        DPU_ERROR("failed to setup DPU encoder %d: rc:%d\n",
@@ -644,7 +644,7 @@ static int _dpu_kms_initialize_writeback(struct drm_device *dev,
        info.num_of_h_tiles = 1;
        /* use only WB idx 2 instance for DPU */
        info.h_tile_instance[0] = WB_2;
-       info.intf_type = encoder->encoder_type;
+       info.intf_type = INTF_WB;
 
        rc = dpu_encoder_setup(dev, encoder, &info);
        if (rc) {