Re: [PATCH 2/4] drm/msm/disp/dpu1: populate disp_info if an interface is external

Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx> · Wed, 9 Nov 2022 15:22:40 +0300

On 09/11/2022 15:16, Kalyan Thota wrote:
DRM encoder type is same for eDP and DP (DRM_MODE_ENCODER_TMDS)
populate is_external information in the disp_info so as to
differentiate between eDP and DP on the DPU encoder side.

Signed-off-by: Kalyan Thota <quic_kalyant@xxxxxxxxxxx>
---
  drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 20 +++++++++++++++++---
  drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 14 +++++++++++---
  drivers/gpu/drm/msm/dp/dp_display.c         |  5 +++++
  drivers/gpu/drm/msm/msm_drv.h               |  7 ++++++-
  4 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 9c6817b..5d6ad1f 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -2412,7 +2412,7 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc,
  	struct dpu_kms *dpu_kms = to_dpu_kms(priv->kms);
  	struct drm_encoder *drm_enc = NULL;
  	struct dpu_encoder_virt *dpu_enc = NULL;
-	int ret = 0;
+	int ret = 0, intf_i;
  
  	dpu_enc = to_dpu_encoder_virt(enc);
  
@@ -2424,13 +2424,16 @@ 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);
  
+	intf_i = disp_info->h_tile_instance[0];
  	if (disp_info->intf_type == DRM_MODE_ENCODER_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 == DRM_MODE_ENCODER_TMDS) {
  		dpu_enc->wide_bus_en = msm_dp_wide_bus_available(
-				priv->dp[disp_info->h_tile_instance[0]]);
+				priv->dp[intf_i]);
+		disp_info->is_external = msm_dp_is_external(priv->dp[intf_i]);
+	}

I will quite myself: "And DSI can be pluggable too. Please enumerate 
connector types here rather than doing that in DP driver."
Your s/pluggable/external/ doesn't fix the issue.

  
  	INIT_DELAYED_WORK(&dpu_enc->delayed_off_work,
  			dpu_encoder_off_work);
@@ -2455,6 +2458,17 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc,
  
  }
  
+bool dpu_encoder_is_external(struct drm_encoder *drm_enc)
+{
+	struct dpu_encoder_virt *dpu_enc;
+
+	if (!drm_enc)
+		return false;
+
+	dpu_enc = to_dpu_encoder_virt(drm_enc);
+	return dpu_enc->disp_info.is_external;
+}
+
  struct drm_encoder *dpu_encoder_init(struct drm_device *dev,
  		int drm_enc_mode)
  {
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
index 9e7236e..43f0d8b 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
@@ -25,16 +25,18 @@
   * @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
- * @is_cmd_mode		Boolean to indicate if the CMD mode is requested
+ * @is_cmd_mode:        Boolean to indicate if the CMD mode is requested
+ * @is_external:        Boolean to indicate if the intf is external
   * @is_te_using_watchdog_timer:  Boolean to indicate watchdog TE is
- *				 used instead of panel TE in cmd mode panels
- * @dsc:		DSC configuration data for DSC-enabled displays
+ *                      used instead of panel TE in cmd mode panels
+ * @dsc:                DSC configuration data for DSC-enabled displays
   */
  struct msm_display_info {
  	int intf_type;
  	uint32_t num_of_h_tiles;
  	uint32_t h_tile_instance[MAX_H_TILES_PER_DISPLAY];
  	bool is_cmd_mode;
+	bool is_external;
  	bool is_te_using_watchdog_timer;
  	struct drm_dsc_config *dsc;
  };
@@ -128,6 +130,12 @@ enum dpu_intf_mode dpu_encoder_get_intf_mode(struct drm_encoder *encoder);
  void dpu_encoder_virt_runtime_resume(struct drm_encoder *encoder);
  
  /**
+ * dpu_encoder_is_external - find if the encoder is of type external
+ * @drm_enc:    Pointer to previously created drm encoder structure
+ */
+bool dpu_encoder_is_external(struct drm_encoder *drm_enc);
+
+/**
   * dpu_encoder_init - initialize virtual encoder object
   * @dev:        Pointer to drm device structure
   * @disp_info:  Pointer to display information structure
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index bfd0aef..0bbdcca5 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -1509,6 +1509,11 @@ bool msm_dp_wide_bus_available(const struct msm_dp *dp_display)
  	return dp->wide_bus_en;
  }
  
+bool msm_dp_is_external(const struct msm_dp *dp_display)
+{
+	return (dp_display->connector_type == DRM_MODE_CONNECTOR_DisplayPort);
+}
+
  void msm_dp_debugfs_init(struct msm_dp *dp_display, struct drm_minor *minor)
  {
  	struct dp_display_private *dp;
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index ea80846..3b9f8d2 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -331,7 +331,7 @@ void msm_dp_snapshot(struct msm_disp_state *disp_state, struct msm_dp *dp_displa
  
  void msm_dp_debugfs_init(struct msm_dp *dp_display, struct drm_minor *minor);
  bool msm_dp_wide_bus_available(const struct msm_dp *dp_display);
-
+bool msm_dp_is_external(const struct msm_dp *dp_display);
  #else
  static inline int __init msm_dp_register(void)
  {
@@ -365,6 +365,11 @@ static inline bool msm_dp_wide_bus_available(const struct msm_dp *dp_display)
  	return false;
  }
  
+static inline bool msm_dp_is_external(const struct msm_dp *dp_display)
+{
+	return false;
+}
+
  #endif
  
  #ifdef CONFIG_DRM_MSM_MDP4

--
With best wishes
Dmitry







