drm/msm/mdp5: Encoder related cleanups
cover drm/msm/mdp5: Encoder related cleanups
The MDP5 and DSI drivers created 2 drm_encoders for a DSI interface (one for each mode of operation). This patch fixes that.
Now, with the # encoders equal to the # of displays, we can create the right # of CRTCs. We previously created LM # of CRTCs, which ate up too many primary planes.
Archit Taneja (6):
drm/msm: Construct only one encoder for DSI drm/msm: Set encoder's mode of operation using a kms func drm/msm/mdp5: Prepare for merging video and command encoders drm/msm/mdp5: Create single encoder per interface (INTF) drm/msm/mdp5: cfg: Change count to unsigned int drm/msm/mdp5: Create only as many CRTCs as we need
drivers/gpu/drm/msm/dsi/dsi.c | 17 ++- drivers/gpu/drm/msm/dsi/dsi.h | 5 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 2 + drivers/gpu/drm/msm/dsi/dsi_manager.c | 34 +++--- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 28 +++-- drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h | 2 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 135 +++--------------------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 77 ++++++++++---- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 86 ++++++++------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 37 +++++-- drivers/gpu/drm/msm/msm_drv.h | 9 +- drivers/gpu/drm/msm/msm_kms.h | 3 + 12 files changed, 195 insertions(+), 240 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 1/6 drm/msm: Construct only one encoder for DSI
We currently create 2 encoders for DSI interfaces, one for command mode and other for video mode operation. This isn't needed as we can't really use both the encoders at the same time. It also makes connecting bridges harder.
Switch to creating a single encoder. For now, we assume that the encoder is configured only in video mode. Later, the same encoder would be usable in both modes.
--- drivers/gpu/drm/msm/dsi/dsi.c | 17 ++++++----------- drivers/gpu/drm/msm/dsi/dsi.h | 4 ++-- drivers/gpu/drm/msm/dsi/dsi_manager.c | 22 ++++------------------ drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 28 ++++++++++++---------------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 20 ++++++-------------- drivers/gpu/drm/msm/msm_drv.h | 9 ++------- 6 files changed, 32 insertions(+), 68 deletions(-)
drivers/gpu/drm/msm/dsi/dsi.c +6 -11
@@ -18,9 +18,7 @@ struct drm_encoder *msm_dsi_get_encoder(struct msm_dsi *msm_dsi)if (!msm_dsi || !msm_dsi_device_connected (msm_dsi))return NULL ; -return (msm_dsi->device_flags &MIPI_DSI_MODE_VIDEO ) ? - msm_dsi->encoders[MSM_DSI_VIDEO_ENCODER_ID ] : - msm_dsi->encoders[MSM_DSI_CMD_ENCODER_ID ]; +return msm_dsi->encoder; }static int dsi_get_phy (struct msm_dsi *msm_dsi)
@@ -187,14 +185,13 @@ void __exit msm_dsi_unregister(void) }int msm_dsi_modeset_init (struct msm_dsi *msm_dsi,struct drm_device *dev, -struct drm_encoder *encoders[MSM_DSI_ENCODER_NUM ]) +struct drm_encoder *encoder) {struct msm_drm_private *priv = dev->dev_private;struct drm_bridge *ext_bridge; -int ret, i; +int ret; -if (WARN_ON (!encoders[MSM_DSI_VIDEO_ENCODER_ID ] || - !encoders[MSM_DSI_CMD_ENCODER_ID ])) +if (WARN_ON (!encoder))return -EINVAL ; msm_dsi->dev = dev;
@@ -213,10 +210,8 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, goto fail; } -for (i =0 ; i <MSM_DSI_ENCODER_NUM ; i++) { - encoders[i]->bridge = msm_dsi->bridge; - msm_dsi->encoders[i] = encoders[i]; - } + encoder->bridge = msm_dsi->bridge; + msm_dsi->encoder = encoder;/* * check if the dsi encoder output is connected to a panel or an
drivers/gpu/drm/msm/dsi/dsi.h +2 -2
@@ -73,8 +73,8 @@ struct msm_dsi {struct device *phy_dev;bool phy_enabled; -/* the encoders we are hooked to (outside of dsi block) */ -struct drm_encoder *encoders[MSM_DSI_ENCODER_NUM ]; +/* the encoder we are hooked to (outside of dsi block) */ +struct drm_encoder *encoder;int id; };
drivers/gpu/drm/msm/dsi/dsi_manager.c +4 -18
@@ -540,7 +540,7 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id)struct msm_dsi *msm_dsi =dsi_mgr_get_dsi (id);struct drm_connector *connector =NULL ;struct dsi_connector *dsi_connector; -int ret, i; +int ret; dsi_connector =kzalloc (sizeof (*dsi_connector),GFP_KERNEL );if (!dsi_connector)
@@ -566,9 +566,7 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id) connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; -for (i =0 ; i <MSM_DSI_ENCODER_NUM ; i++) -drm_mode_connector_attach_encoder (connector, - msm_dsi->encoders[i]); +drm_mode_connector_attach_encoder (connector, msm_dsi->encoder);return connector; }
@@ -591,13 +589,7 @@ struct drm_bridge *msm_dsi_manager_bridge_init(u8 id) dsi_bridge->id = id; -/* -* HACK: we may not know the external DSI bridge device's mode -* flags here. We'll get to know them only when the device -* attaches to the dsi host. For now, assume the bridge supports -* DSI video mode -*/ - encoder = msm_dsi->encoders[MSM_DSI_VIDEO_ENCODER_ID ]; + encoder = msm_dsi->encoder; bridge = &dsi_bridge->base; bridge->funcs = &dsi_mgr_bridge_funcs;
@@ -628,13 +620,7 @@ struct drm_connector *msm_dsi_manager_ext_bridge_init(u8 id) ext_bridge = msm_dsi->external_bridge =msm_dsi_host_get_bridge (msm_dsi->host); -/* -* HACK: we may not know the external DSI bridge device's mode -* flags here. We'll get to know them only when the device -* attaches to the dsi host. For now, assume the bridge supports -* DSI video mode -*/ - encoder = msm_dsi->encoders[MSM_DSI_VIDEO_ENCODER_ID ]; + encoder = msm_dsi->encoder;/* link the internal dsi bridge to the external bridge */ drm_bridge_attach (encoder, ext_bridge, int_bridge);
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c +12 -16
@@ -260,8 +260,7 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms,struct drm_encoder *encoder;struct drm_connector *connector;struct device_node *panel_node; -struct drm_encoder *dsi_encs[MSM_DSI_ENCODER_NUM ]; -int i, dsi_id; +int dsi_id;int ret;switch (intf_type) {
@@ -322,22 +321,19 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms,if (!priv->dsi[dsi_id])break ; -for (i =0 ; i <MSM_DSI_ENCODER_NUM ; i++) { - dsi_encs[i] =mdp4_dsi_encoder_init (dev); -if (IS_ERR (dsi_encs[i])) { - ret =PTR_ERR (dsi_encs[i]); -dev_err (dev->dev, -"failed to construct DSI encoder: %d\n" , - ret); -return ret; - } - -/* TODO: Add DMA_S later? */ - dsi_encs[i]->possible_crtcs =1 <<DMA_P ; - priv->encoders[priv->num_encoders++] = dsi_encs[i]; + encoder =mdp4_dsi_encoder_init (dev); +if (IS_ERR (encoder)) { + ret =PTR_ERR (encoder); +dev_err (dev->dev,"failed to construct DSI encoder: %d\n" , + ret); +return ret; } - ret =msm_dsi_modeset_init (priv->dsi[dsi_id], dev, dsi_encs); +/* TODO: Add DMA_S later? */ + encoder->possible_crtcs =1 <<DMA_P ; + priv->encoders[priv->num_encoders++] = encoder; + + ret =msm_dsi_modeset_init (priv->dsi[dsi_id], dev, encoder);if (ret) {dev_err (dev->dev,"failed to initialize DSI: %d\n" , ret);
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c +6 -14
@@ -375,9 +375,6 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, int intf_num)case INTF_DSI : {int dsi_id =get_dsi_id_from_intf (hw_cfg, intf_num); -struct drm_encoder *dsi_encs[MSM_DSI_ENCODER_NUM ]; -enum mdp5_intf_mode mode; -int i;if ((dsi_id >=ARRAY_SIZE (priv->dsi)) || (dsi_id <0 )) { dev_err(dev->dev, "failed to find dsi from intf %d\n",
@@ -395,19 +392,14 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, int intf_num)break ; } -for (i =0 ; i <MSM_DSI_ENCODER_NUM ; i++) { - mode = (i ==MSM_DSI_CMD_ENCODER_ID ) ? -MDP5_INTF_DSI_MODE_COMMAND : -MDP5_INTF_DSI_MODE_VIDEO ; - dsi_encs[i] =construct_encoder (mdp5_kms,INTF_DSI , - intf_num, mode, ctl); -if (IS_ERR (dsi_encs[i])) { - ret =PTR_ERR (dsi_encs[i]); -break ; - } + encoder =construct_encoder (mdp5_kms,INTF_DSI , intf_num, +MDP5_INTF_DSI_MODE_VIDEO , ctl); +if (IS_ERR (encoder)) { + ret =PTR_ERR (encoder); +break ; } - ret =msm_dsi_modeset_init (priv->dsi[dsi_id], dev, dsi_encs); + ret =msm_dsi_modeset_init (priv->dsi[dsi_id], dev, encoder);break ; }default :
drivers/gpu/drm/msm/msm_drv.h +2 -7
@@ -275,16 +275,11 @@ int msm_edp_modeset_init(struct msm_edp *edp, struct drm_device *dev, struct drm_encoder *encoder);struct msm_dsi ; -enum msm_dsi_encoder_id { -MSM_DSI_VIDEO_ENCODER_ID =0 , -MSM_DSI_CMD_ENCODER_ID =1 , -MSM_DSI_ENCODER_NUM =2 -};#ifdef CONFIG_DRM_MSM_DSI void __init msm_dsi_register (void ); void __exit msm_dsi_unregister(void);int msm_dsi_modeset_init (struct msm_dsi *msm_dsi,struct drm_device *dev, -struct drm_encoder *encoders[MSM_DSI_ENCODER_NUM ]); +struct drm_encoder *encoder);#else static inline void __init msm_dsi_register (void ) {
@@ -294,7 +289,7 @@ static inline void __exit msm_dsi_unregister(void) }static inline int msm_dsi_modeset_init (struct msm_dsi *msm_dsi,struct drm_device *dev, -struct drm_encoder *encoders[MSM_DSI_ENCODER_NUM ]) +struct drm_encoder *encoder) {return -EINVAL ; }
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 2/6 drm/msm: Set encoder's mode of operation using a kms func
In reply to Archit TanejaThe mdp5 kms driver currently sets up multiple encoders per interface (INTF), one for each kind of mode of operation it supports. We create 2 drm_encoders for DSI, one for video mode and the other for command mode operation. The reason behind this approach could have been that we aren't aware of the DSI device's mode of operation when we create the encoders.
This makes things a bit complicated, since these encoders have to be further attached to the same DSI bridge. The easier way out is to create a single encoder, and make the DSI driver set its mode of operation when we know what the DSI device's mode flags are.
Start with providing a way to set the mdp5_intf_mode using a kms func.
--- drivers/gpu/drm/msm/dsi/dsi.h | 1 + drivers/gpu/drm/msm/dsi/dsi_host.c | 2 ++ drivers/gpu/drm/msm/dsi/dsi_manager.c | 12 ++++++++++++ drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 17 +++++++++++++++++ drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 8 ++++++++ drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 1 + drivers/gpu/drm/msm/msm_kms.h | 3 +++ 7 files changed, 44 insertions(+)
drivers/gpu/drm/msm/dsi/dsi.h +1 -0
@@ -90,6 +90,7 @@ int msm_dsi_manager_phy_enable(int id,void msm_dsi_manager_phy_disable (int id);int msm_dsi_manager_cmd_xfer (int id,const struct mipi_dsi_msg *msg);bool msm_dsi_manager_cmd_xfer_trigger (int id,u32 dma_base,u32 len); +void msm_dsi_manager_attach_dsi_device (int id,u32 device_flags);int msm_dsi_manager_register (struct msm_dsi *msm_dsi);void msm_dsi_manager_unregister (struct msm_dsi *msm_dsi);
drivers/gpu/drm/msm/dsi/dsi_host.c +2 -0
@@ -1482,6 +1482,8 @@ static int dsi_host_attach(struct mipi_dsi_host *host, msm_host->format = dsi->format; msm_host->mode_flags = dsi->mode_flags; +msm_dsi_manager_attach_dsi_device (msm_host->id, dsi->mode_flags); +/* Some gpios defined in panel DT need to be controlled by host */ ret =dsi_host_init_panel_gpios (msm_host, &dsi->dev);if (ret)
drivers/gpu/drm/msm/dsi/dsi_manager.c +12 -0
@@ -773,6 +773,18 @@ bool msm_dsi_manager_cmd_xfer_trigger(int id, u32 dma_base, u32 len)return true; } +void msm_dsi_manager_attach_dsi_device (int id,u32 device_flags) +{ +struct msm_dsi *msm_dsi =dsi_mgr_get_dsi (id); +struct msm_drm_private *priv = msm_dsi->dev->dev_private; +struct msm_kms *kms = priv->kms; +struct drm_encoder *encoder =msm_dsi_get_encoder (msm_dsi); + +if (encoder && kms->funcs->set_encoder_mode) +if (!(device_flags &MIPI_DSI_MODE_VIDEO )) + kms->funcs->set_encoder_mode (kms, encoder, true); +} +int msm_dsi_manager_register (struct msm_dsi *msm_dsi) {struct msm_dsi_manager *msm_dsim = &msm_dsim_glb;
drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c +17 -0
@@ -342,6 +342,23 @@ int mdp5_encoder_set_split_display(struct drm_encoder *encoder,return 0 ; } +void mdp5_encoder_set_intf_mode (struct drm_encoder *encoder,bool cmd_mode) +{ +struct mdp5_encoder *mdp5_encoder =to_mdp5_encoder (encoder); +struct mdp5_interface *intf = &mdp5_encoder->intf; + +/* TODO: Expand this to set writeback modes too */ +if (cmd_mode) { +WARN_ON (intf->type !=INTF_DSI ); + intf->mode =MDP5_INTF_DSI_MODE_COMMAND ; + }else { +if (intf->type ==INTF_DSI ) + intf->mode =MDP5_INTF_DSI_MODE_VIDEO ; +else + intf->mode =MDP5_INTF_MODE_NONE ; + } +} +/* initialize encoder */ struct drm_encoder *mdp5_encoder_init (struct drm_device *dev,struct mdp5_interface *intf,struct mdp5_ctl *ctl)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c +8 -0
@@ -157,6 +157,13 @@ static int mdp5_set_split_display(struct msm_kms *kms,return mdp5_encoder_set_split_display (encoder, slave_encoder); } +static void mdp5_set_encoder_mode (struct msm_kms *kms, +struct drm_encoder *encoder, +bool cmd_mode) +{ +mdp5_encoder_set_intf_mode (encoder, cmd_mode); +} +static void mdp5_kms_destroy (struct msm_kms *kms) {struct mdp5_kms *mdp5_kms =to_mdp5_kms (to_mdp_kms (kms));
@@ -236,6 +243,7 @@ static void mdp5_kms_debugfs_cleanup(struct msm_kms *kms, struct drm_minor *mino .get_format = mdp_get_format, .round_pixclk = mdp5_round_pixclk, .set_split_display = mdp5_set_split_display, + .set_encoder_mode = mdp5_set_encoder_mode, .destroy = mdp5_kms_destroy, #ifdef CONFIG_DEBUG_FS .debugfs_init = mdp5_kms_debugfs_init,
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h +1 -0
@@ -250,6 +250,7 @@ struct drm_encoder *mdp5_encoder_init(struct drm_device *dev, struct mdp5_interface *intf, struct mdp5_ctl *ctl);int mdp5_encoder_set_split_display (struct drm_encoder *encoder,struct drm_encoder *slave_encoder); +void mdp5_encoder_set_intf_mode (struct drm_encoder *encoder,bool cmd_mode);int mdp5_encoder_get_linecount (struct drm_encoder *encoder);u32 mdp5_encoder_get_framecount (struct drm_encoder *encoder);
drivers/gpu/drm/msm/msm_kms.h +3 -0
@@ -56,6 +56,9 @@ struct msm_kms_funcs {struct drm_encoder *encoder, struct drm_encoder *slave_encoder, bool is_cmd_mode); +void (*set_encoder_mode)(struct msm_kms *kms, +struct drm_encoder *encoder, +bool cmd_mode);/* cleanup: */ void (*destroy)(struct msm_kms *kms);#ifdef CONFIG_DEBUG_FS
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 3/6 drm/msm/mdp5: Prepare for merging video and command encoders
In reply to Archit TanejaRename the mdp5_encoder_* ops for active displays to mdp5_vid_encoder_* ops.
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 31 ++++++++++++++++++++++------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 3 ++- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 4 ++-- 3 files changed, 28 insertions(+), 10 deletions(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c +24 -7
@@ -112,9 +112,9 @@ static void mdp5_encoder_destroy(struct drm_encoder *encoder) .destroy = mdp5_encoder_destroy, }; -static void mdp5_encoder_mode_set (struct drm_encoder *encoder, -struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode) +static void mdp5_vid_encoder_mode_set (struct drm_encoder *encoder, +struct drm_display_mode *mode, +struct drm_display_mode *adjusted_mode) {struct mdp5_encoder *mdp5_encoder =to_mdp5_encoder (encoder);struct mdp5_kms *mdp5_kms =get_kms (encoder);
@@ -221,7 +221,7 @@ static void mdp5_encoder_mode_set(struct drm_encoder *encoder, mdp5_encoder->ctl); } -static void mdp5_encoder_disable (struct drm_encoder *encoder) +static void mdp5_vid_encoder_disable (struct drm_encoder *encoder) {struct mdp5_encoder *mdp5_encoder =to_mdp5_encoder (encoder);struct mdp5_kms *mdp5_kms =get_kms (encoder);
@@ -256,7 +256,7 @@ static void mdp5_encoder_disable(struct drm_encoder *encoder) mdp5_encoder->enabled = false; } -static void mdp5_encoder_enable (struct drm_encoder *encoder) +static void mdp5_vid_encoder_enable (struct drm_encoder *encoder) {struct mdp5_encoder *mdp5_encoder =to_mdp5_encoder (encoder);struct mdp5_kms *mdp5_kms =get_kms (encoder);
@@ -279,6 +279,23 @@ static void mdp5_encoder_enable(struct drm_encoder *encoder) mdp5_encoder->enabled = true; } +static void mdp5_encoder_mode_set (struct drm_encoder *encoder, +struct drm_display_mode *mode, +struct drm_display_mode *adjusted_mode) +{ +mdp5_vid_encoder_mode_set (encoder, mode, adjusted_mode); +} + +static void mdp5_encoder_disable (struct drm_encoder *encoder) +{ +mdp5_vid_encoder_disable (encoder); +} + +static void mdp5_encoder_enable (struct drm_encoder *encoder) +{ +mdp5_vid_encoder_enable (encoder); +} +static const struct drm_encoder_helper_funcs mdp5_encoder_helper_funcs = { .mode_set = mdp5_encoder_mode_set, .disable = mdp5_encoder_disable,
@@ -303,8 +320,8 @@ u32 mdp5_encoder_get_framecount(struct drm_encoder *encoder)return mdp5_read (mdp5_kms,REG_MDP5_INTF_FRAME_COUNT (intf)); } -int mdp5_encoder_set_split_display (struct drm_encoder *encoder, -struct drm_encoder *slave_encoder) +int mdp5_vid_encoder_set_split_display (struct drm_encoder *encoder, +struct drm_encoder *slave_encoder) {struct mdp5_encoder *mdp5_encoder =to_mdp5_encoder (encoder);struct mdp5_encoder *mdp5_slave_enc =to_mdp5_encoder (slave_encoder);
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c +2 -1
@@ -154,7 +154,8 @@ static int mdp5_set_split_display(struct msm_kms *kms,return mdp5_cmd_encoder_set_split_display (encoder, slave_encoder); else - return mdp5_encoder_set_split_display(encoder, slave_encoder); + return mdp5_vid_encoder_set_split_display(encoder, +slave_encoder ); } static void mdp5_set_encoder_mode(struct msm_kms *kms,
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h +2 -2
@@ -248,8 +248,8 @@ struct drm_crtc *mdp5_crtc_init(struct drm_device *dev,struct drm_encoder *mdp5_encoder_init (struct drm_device *dev,struct mdp5_interface *intf,struct mdp5_ctl *ctl); -int mdp5_encoder_set_split_display (struct drm_encoder *encoder, -struct drm_encoder *slave_encoder); +int mdp5_vid_encoder_set_split_display (struct drm_encoder *encoder, +struct drm_encoder *slave_encoder);void mdp5_encoder_set_intf_mode (struct drm_encoder *encoder,bool cmd_mode);int mdp5_encoder_get_linecount (struct drm_encoder *encoder);u32 mdp5_encoder_get_framecount (struct drm_encoder *encoder);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 4/6 drm/msm/mdp5: Create single encoder per interface (INTF)
In reply to Archit TanejaFor the DSI interfaces, the mdp5_kms core creates 2 encoders for video and command modes.
Create only a single encoder per interface. When creating the encoder, set the interface type to MDP5_INTF_MODE_NONE. It's the bridge (DSI/HDMI/eDP) driver's responsibility to set a different interface type. It can use the the kms func op set_encoder_mode to change the mode of operation, which in turn would configure the interface type for the INTF.
In mdp5_cmd_encoder.c, we remove the redundant code, and make the commmand mode funcs as helpers that are used in mdp5_encoder.c
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 135 +++--------------------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 35 +++--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 20 ++-- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 32 ++++-- 4 files changed, 66 insertions(+), 156 deletions(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c +13 -122
@@ -16,16 +16,6 @@#include "drm_crtc.h" #include "drm_crtc_helper.h" -struct mdp5_cmd_encoder { -struct drm_encoder base; -struct mdp5_interface intf; -bool enabled; -uint32_t bsc; - -struct mdp5_ctl *ctl; -}; -#define to_mdp5_cmd_encoder (x) container_of(x, struct mdp5_cmd_encoder, base) -static struct mdp5_kms *get_kms (struct drm_encoder *encoder) {struct msm_drm_private *priv = encoder->dev->dev_private;
@@ -36,47 +26,8 @@ static struct mdp5_kms *get_kms(struct drm_encoder *encoder)#include <mach/board.h> #include <linux/msm-bus.h> #include <linux/msm-bus-board.h> -#define MDP_BUS_VECTOR_ENTRY (ab_val, ib_val) \ - { \ - .src = MSM_BUS_MASTER_MDP_PORT0, \ - .dst = MSM_BUS_SLAVE_EBI_CH0, \ - .ab = (ab_val), \ - .ib = (ib_val), \ - } - -static struct msm_bus_vectors mdp_bus_vectors[] = { -MDP_BUS_VECTOR_ENTRY (0 ,0 ), -MDP_BUS_VECTOR_ENTRY (2000000000 ,2000000000 ), -}; -static struct msm_bus_paths mdp_bus_usecases[] = { { - .num_paths =1 , - .vectors = &mdp_bus_vectors[0 ], -}, { - .num_paths =1 , - .vectors = &mdp_bus_vectors[1 ], -} }; -static struct msm_bus_scale_pdata mdp_bus_scale_table = { - .usecase = mdp_bus_usecases, - .num_usecases =ARRAY_SIZE (mdp_bus_usecases), - .name ="mdss_mdp" , -}; - -static void bs_init (struct mdp5_cmd_encoder *mdp5_cmd_enc) -{ - mdp5_cmd_enc->bsc =msm_bus_scale_register_client ( - &mdp_bus_scale_table); -DBG ("bus scale client: %08x" , mdp5_cmd_enc->bsc); -} - -static void bs_fini (struct mdp5_cmd_encoder *mdp5_cmd_enc) -{ -if (mdp5_cmd_enc->bsc) { -msm_bus_scale_unregister_client (mdp5_cmd_enc->bsc); - mdp5_cmd_enc->bsc =0 ; - } -} -static void bs_set (struct mdp5_cmd_encoder *mdp5_cmd_enc,int idx) +static void bs_set (struct mdp5_encoder *mdp5_cmd_enc,int idx) {if (mdp5_cmd_enc->bsc) {DBG ("set bus scaling: %d" , idx);
@@ -89,14 +40,12 @@ static void bs_set(struct mdp5_cmd_encoder *mdp5_cmd_enc, int idx) } }#else -static void bs_init (struct mdp5_cmd_encoder *mdp5_cmd_enc) {} -static void bs_fini (struct mdp5_cmd_encoder *mdp5_cmd_enc) {} -static void bs_set (struct mdp5_cmd_encoder *mdp5_cmd_enc,int idx) {} +static void bs_set (struct mdp5_encoder *mdp5_cmd_enc,int idx) {}#endif #define VSYNC_CLK_RATE 19200000static int pingpong_tearcheck_setup (struct drm_encoder *encoder, -struct drm_display_mode *mode) +struct drm_display_mode *mode) {struct mdp5_kms *mdp5_kms =get_kms (encoder);struct device *dev = encoder->dev->dev;
@@ -176,23 +125,11 @@ static void pingpong_tearcheck_disable(struct drm_encoder *encoder)clk_disable_unprepare (mdp5_kms->vsync_clk); } -static void mdp5_cmd_encoder_destroy (struct drm_encoder *encoder) -{ -struct mdp5_cmd_encoder *mdp5_cmd_enc =to_mdp5_cmd_encoder (encoder); -bs_fini (mdp5_cmd_enc); -drm_encoder_cleanup (encoder); -kfree (mdp5_cmd_enc); -} - -static const struct drm_encoder_funcs mdp5_cmd_encoder_funcs = { - .destroy = mdp5_cmd_encoder_destroy, -}; - -static void mdp5_cmd_encoder_mode_set (struct drm_encoder *encoder, -struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode) +void mdp5_cmd_encoder_mode_set (struct drm_encoder *encoder, +struct drm_display_mode *mode, +struct drm_display_mode *adjusted_mode) { -struct mdp5_cmd_encoder *mdp5_cmd_enc =to_mdp5_cmd_encoder (encoder); +struct mdp5_encoder *mdp5_cmd_enc =to_mdp5_encoder (encoder); mode = adjusted_mode;
@@ -209,9 +146,9 @@ static void mdp5_cmd_encoder_mode_set(struct drm_encoder *encoder, mdp5_cmd_enc->ctl); } -static void mdp5_cmd_encoder_disable (struct drm_encoder *encoder) +void mdp5_cmd_encoder_disable (struct drm_encoder *encoder) { -struct mdp5_cmd_encoder *mdp5_cmd_enc =to_mdp5_cmd_encoder (encoder); +struct mdp5_encoder *mdp5_cmd_enc =to_mdp5_encoder (encoder);struct mdp5_ctl *ctl = mdp5_cmd_enc->ctl;struct mdp5_interface *intf = &mdp5_cmd_enc->intf;
@@ -228,9 +165,9 @@ static void mdp5_cmd_encoder_disable(struct drm_encoder *encoder) mdp5_cmd_enc->enabled = false; } -static void mdp5_cmd_encoder_enable (struct drm_encoder *encoder) +void mdp5_cmd_encoder_enable (struct drm_encoder *encoder) { -struct mdp5_cmd_encoder *mdp5_cmd_enc =to_mdp5_cmd_encoder (encoder); +struct mdp5_encoder *mdp5_cmd_enc =to_mdp5_encoder (encoder);struct mdp5_ctl *ctl = mdp5_cmd_enc->ctl;struct mdp5_interface *intf = &mdp5_cmd_enc->intf;
@@ -248,16 +185,10 @@ static void mdp5_cmd_encoder_enable(struct drm_encoder *encoder) mdp5_cmd_enc->enabled = true; } -static const struct drm_encoder_helper_funcs mdp5_cmd_encoder_helper_funcs = { - .mode_set = mdp5_cmd_encoder_mode_set, - .disable = mdp5_cmd_encoder_disable, - .enable = mdp5_cmd_encoder_enable, -}; -int mdp5_cmd_encoder_set_split_display (struct drm_encoder *encoder, -struct drm_encoder *slave_encoder) +struct drm_encoder *slave_encoder) { -struct mdp5_cmd_encoder *mdp5_cmd_enc =to_mdp5_cmd_encoder (encoder); +struct mdp5_encoder *mdp5_cmd_enc =to_mdp5_encoder (encoder);struct mdp5_kms *mdp5_kms;int intf_num;u32 data =0 ;
@@ -292,43 +223,3 @@ int mdp5_cmd_encoder_set_split_display(struct drm_encoder *encoder,return 0 ; } - -/* initialize command mode encoder */ -struct drm_encoder *mdp5_cmd_encoder_init (struct drm_device *dev, -struct mdp5_interface *intf,struct mdp5_ctl *ctl) -{ -struct drm_encoder *encoder =NULL ; -struct mdp5_cmd_encoder *mdp5_cmd_enc; -int ret; - -if (WARN_ON ((intf->type !=INTF_DSI ) && - (intf->mode !=MDP5_INTF_DSI_MODE_COMMAND ))) { - ret = -EINVAL ; - goto fail; - } - - mdp5_cmd_enc =kzalloc (sizeof (*mdp5_cmd_enc),GFP_KERNEL ); -if (!mdp5_cmd_enc) { - ret = -ENOMEM ; - goto fail; - } - -memcpy (&mdp5_cmd_enc->intf, intf,sizeof (mdp5_cmd_enc->intf)); - encoder = &mdp5_cmd_enc->base; - mdp5_cmd_enc->ctl = ctl; - -drm_encoder_init (dev, encoder, &mdp5_cmd_encoder_funcs, -DRM_MODE_ENCODER_DSI ,NULL ); - -drm_encoder_helper_add (encoder, &mdp5_cmd_encoder_helper_funcs); - -bs_init (mdp5_cmd_enc); - -return encoder; - -fail: -if (encoder) -mdp5_cmd_encoder_destroy (encoder); - -return ERR_PTR (ret); -}
drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c +21 -14
@@ -21,17 +21,6 @@#include "drm_crtc.h" #include "drm_crtc_helper.h" -struct mdp5_encoder { -struct drm_encoder base; -struct mdp5_interface intf; -spinlock_t intf_lock;/* protect REG_MDP5_INTF_* registers */ -bool enabled; -uint32_t bsc; - -struct mdp5_ctl *ctl; -}; -#define to_mdp5_encoder (x) container_of(x, struct mdp5_encoder, base) -static struct mdp5_kms *get_kms (struct drm_encoder *encoder) {struct msm_drm_private *priv = encoder->dev->dev_private;
@@ -283,17 +272,35 @@ static void mdp5_encoder_mode_set(struct drm_encoder *encoder,struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) { -mdp5_vid_encoder_mode_set (encoder ,mode ,adjusted_mode ); + struct mdp5_encoder *mdp5_encoder = to_mdp5_encoder(encoder); +struct mdp5_interface *intf = &mdp5_encoder->intf; + +if (intf->mode ==MDP5_INTF_DSI_MODE_COMMAND ) +mdp5_cmd_encoder_mode_set (encoder, mode, adjusted_mode); +else +mdp5_vid_encoder_mode_set (encoder, mode, adjusted_mode); }static void mdp5_encoder_disable (struct drm_encoder *encoder) { -mdp5_vid_encoder_disable (encoder); +struct mdp5_encoder *mdp5_encoder =to_mdp5_encoder (encoder); +struct mdp5_interface *intf = &mdp5_encoder->intf; + +if (intf->mode ==MDP5_INTF_DSI_MODE_COMMAND ) +mdp5_cmd_encoder_disable (encoder); +else +mdp5_vid_encoder_disable (encoder); }static void mdp5_encoder_enable (struct drm_encoder *encoder) { -mdp5_vid_encoder_enable (encoder); +struct mdp5_encoder *mdp5_encoder =to_mdp5_encoder (encoder); +struct mdp5_interface *intf = &mdp5_encoder->intf; + +if (intf->mode ==MDP5_INTF_DSI_MODE_COMMAND ) +mdp5_cmd_encoder_disable (encoder); +else +mdp5_vid_encoder_enable (encoder); } static const struct drm_encoder_helper_funcs mdp5_encoder_helper_funcs = {
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c +6 -14
@@ -282,7 +282,7 @@ int mdp5_enable(struct mdp5_kms *mdp5_kms)static struct drm_encoder *construct_encoder (struct mdp5_kms *mdp5_kms,enum mdp5_intf_type intf_type,int intf_num, -enum mdp5_intf_mode intf_mode,struct mdp5_ctl *ctl) +struct mdp5_ctl *ctl) {struct drm_device *dev = mdp5_kms->dev;struct msm_drm_private *priv = dev->dev_private;
@@ -290,15 +290,10 @@ static struct drm_encoder *construct_encoder(struct mdp5_kms *mdp5_kms,struct mdp5_interface intf = { .num = intf_num, .type = intf_type, - .mode = intf_mode, + .mode =MDP5_INTF_MODE_NONE , }; -if ((intf_type ==INTF_DSI ) && - (intf_mode ==MDP5_INTF_DSI_MODE_COMMAND )) - encoder =mdp5_cmd_encoder_init (dev, &intf, ctl); -else - encoder =mdp5_encoder_init (dev, &intf, ctl); - + encoder =mdp5_encoder_init (dev, &intf, ctl);if (IS_ERR (encoder)) {dev_err (dev->dev,"failed to construct encoder\n" );return encoder;
@@ -353,8 +348,7 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, int intf_num)break ; } - encoder =construct_encoder (mdp5_kms, INTF_eDP, intf_num, -MDP5_INTF_MODE_NONE , ctl); + encoder =construct_encoder (mdp5_kms, INTF_eDP, intf_num, ctl);if (IS_ERR (encoder)) { ret =PTR_ERR (encoder);break ;
@@ -372,8 +366,7 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, int intf_num)break ; } - encoder =construct_encoder (mdp5_kms,INTF_HDMI , intf_num, -MDP5_INTF_MODE_NONE , ctl); + encoder =construct_encoder (mdp5_kms,INTF_HDMI , intf_num, ctl);if (IS_ERR (encoder)) { ret =PTR_ERR (encoder);break ;
@@ -401,8 +394,7 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, int intf_num)break ; } - encoder =construct_encoder (mdp5_kms,INTF_DSI , intf_num, -MDP5_INTF_DSI_MODE_VIDEO , ctl); + encoder =construct_encoder (mdp5_kms,INTF_DSI , intf_num, ctl);if (IS_ERR (encoder)) { ret =PTR_ERR (encoder);break ;
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h +26 -6
@@ -128,6 +128,17 @@ struct mdp5_interface {enum mdp5_intf_mode mode; }; +struct mdp5_encoder { +struct drm_encoder base; +struct mdp5_interface intf; +spinlock_t intf_lock;/* protect REG_MDP5_INTF_* registers */ +bool enabled; +uint32_t bsc; + +struct mdp5_ctl *ctl; +}; +#define to_mdp5_encoder (x) container_of(x, struct mdp5_encoder, base) +static inline void mdp5_write (struct mdp5_kms *mdp5_kms,u32 reg,u32 data) {msm_writel (data, mdp5_kms->mmio + reg);
@@ -255,15 +266,24 @@ int mdp5_vid_encoder_set_split_display(struct drm_encoder *encoder,u32 mdp5_encoder_get_framecount (struct drm_encoder *encoder);#ifdef CONFIG_DRM_MSM_DSI -struct drm_encoder *mdp5_cmd_encoder_init (struct drm_device *dev, -struct mdp5_interface *intf,struct mdp5_ctl *ctl); +void mdp5_cmd_encoder_mode_set (struct drm_encoder *encoder, +struct drm_display_mode *mode, +struct drm_display_mode *adjusted_mode); +void mdp5_cmd_encoder_disable (struct drm_encoder *encoder); +void mdp5_cmd_encoder_enable (struct drm_encoder *encoder);int mdp5_cmd_encoder_set_split_display (struct drm_encoder *encoder, -struct drm_encoder *slave_encoder); +struct drm_encoder *slave_encoder);#else -static inline struct drm_encoder *mdp5_cmd_encoder_init (struct drm_device *dev, -struct mdp5_interface *intf,struct mdp5_ctl *ctl) +static inline void mdp5_cmd_encoder_mode_set (struct drm_encoder *encoder, +struct drm_display_mode *mode, +struct drm_display_mode *adjusted_mode) +{ +} +static inline void mdp5_cmd_encoder_disable (struct drm_encoder *encoder) +{ +} +static inline void mdp5_cmd_encoder_enable (struct drm_encoder *encoder) { -return ERR_PTR (-EINVAL ); }static inline int mdp5_cmd_encoder_set_split_display (struct drm_encoder *encoder,struct drm_encoder *slave_encoder)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 5/6 drm/msm/mdp5: cfg: Change count to unsigned int
In reply to Archit TanejaCount can't be non-zero. Changing to uint will also prevent future warnings.
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h +1 -1
@@ -32,7 +32,7 @@ typedef DECLARE_BITMAP(mdp5_smp_state_t, MAX_SMP_BLOCKS);#define MDP5_SUB_BLOCK_DEFINITION \ - int count; \ + unsigned int count; \ uint32_t base[MAX_BASES]struct mdp5_sub_block {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 6/6 drm/msm/mdp5: Create only as many CRTCs as we need
In reply to Archit TanejaWe currently create CRTCs equaling to the # of Layer Mixer blocks we have on the MDP5 HW. This number is generally more than the # of encoders (INTFs) we have in the MDSS HW. The number of encoders connected to displays on the platform (as described by DT) would be even lesser.
Create only N drm_crtcs, where N is the number of drm_encoders successfully registered. To do this, we call modeset_init_intf() before we init the drm_crtcs and drm_planes.
Because of this change, setting encoder->possible_crtcs needs to be moved from construct_encoder() to a later point when we know how many CRTCs we have.
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 39 ++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 10 deletions(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c +29 -10
@@ -299,7 +299,6 @@ static struct drm_encoder *construct_encoder(struct mdp5_kms *mdp5_kms,return encoder; } - encoder->possible_crtcs = (1 << priv->num_crtcs) -1 ; priv->encoders[priv->num_encoders++] = encoder;return encoder;
@@ -417,16 +416,35 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)struct drm_device *dev = mdp5_kms->dev;struct msm_drm_private *priv = dev->dev_private;const struct mdp5_cfg_hw *hw_cfg; +unsigned int num_crtcs;int i, ret; hw_cfg =mdp5_cfg_get_hw_config (mdp5_kms->cfg); -/* Construct planes equaling the number of hw pipes, and CRTCs -* for the N layer-mixers (LM). The first N planes become primary +/* +* Construct encoders and modeset initialize connector devices +* for each external display interface. +*/ +for (i =0 ; i <ARRAY_SIZE (hw_cfg->intf.connect); i++) { + ret =modeset_init_intf (mdp5_kms, i); +if (ret) + goto fail; + } + +/* +* We should ideally have less number of encoders (set up by parsing +* the MDP5 interfaces) than the number of layer mixers present in HW, +* but let's be safe here anyway +*/ + num_crtcs =min (priv->num_encoders, mdp5_cfg->lm.count); + +/* +* Construct planes equaling the number of hw pipes, and CRTCs for the +* N encoders set up by the driver. The first N planes become primary * planes for the CRTCs, with the remainder as overlay planes: */ for (i =0 ; i < mdp5_kms->num_hwpipes; i++) { -bool primary = i < mdp5_cfg->lm.count; +bool primary = i < num_crtcs;struct drm_plane *plane;struct drm_crtc *crtc;
@@ -450,13 +468,14 @@ static int modeset_init(struct mdp5_kms *mdp5_kms) priv->crtcs[priv->num_crtcs++] = crtc; } -/* Construct encoders and modeset initialize connector devices -* for each external display interface. +/* +* Now that we know the number of crtcs we've created, set the possible +* crtcs for the encoders */ -for (i =0 ; i <ARRAY_SIZE (hw_cfg->intf.connect); i++) { - ret =modeset_init_intf (mdp5_kms, i); -if (ret) - goto fail; +for (i =0 ; i < priv->num_encoders; i++) { +struct drm_encoder *encoder = priv->encoders[i]; + + encoder->possible_crtcs = (1 << priv->num_crtcs) -1 ; }return 0 ;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
v2 cover drm/msm/mdp5: Encoder related cleanups
In reply to Archit TanejaThe MDP5 and DSI drivers created 2 drm_encoders for a DSI interface (one for each mode of operation). This set creates one encoder per DSI interface. This is needed by the updated drm_bridge API.
Now, with the # encoders equal to the # of displays, we can create the right # of CRTCs. We previously created LM # of CRTCs, which was a bit unnecessary.
Changes in v2:
- Rebase over bridge API updates going in 4.11
- Fix issues seen when calling kms func's set_encoder_mode for devices where the control/primary device is of the type mipi_dsi_device
Archit Taneja (6):
drm/msm: Construct only one encoder for DSI drm/msm: Set encoder's mode of operation using a kms func drm/msm/mdp5: Prepare for merging video and command encoders drm/msm/mdp5: Create single encoder per interface (INTF) drm/msm/mdp5: cfg: Change count to unsigned int drm/msm/mdp5: Create only as many CRTCs as we need
drivers/gpu/drm/msm/dsi/dsi.c | 14 +-- drivers/gpu/drm/msm/dsi/dsi.h | 5 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 2 + drivers/gpu/drm/msm/dsi/dsi_manager.c | 61 +++++++---- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 28 +++-- drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h | 2 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 135 +++--------------------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 77 ++++++++++---- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 86 ++++++++------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 37 +++++-- drivers/gpu/drm/msm/msm_drv.h | 11 +- drivers/gpu/drm/msm/msm_kms.h | 3 + 12 files changed, 219 insertions(+), 242 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 1/6 drm/msm: Construct only one encoder for DSI
We currently create 2 encoders for DSI interfaces, one for command mode and other for video mode operation. This isn't needed as we can't really use both the encoders at the same time. It also makes connecting bridges harder.
Switch to creating a single encoder. For now, we assume that the encoder is configured only in video mode. Later, the same encoder would be usable in both modes.
--- drivers/gpu/drm/msm/dsi/dsi.c | 14 +++++--------- drivers/gpu/drm/msm/dsi/dsi.h | 4 ++-- drivers/gpu/drm/msm/dsi/dsi_manager.c | 22 ++++------------------ drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 28 ++++++++++++---------------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 20 ++++++-------------- drivers/gpu/drm/msm/msm_drv.h | 11 +++-------- 6 files changed, 32 insertions(+), 67 deletions(-)
drivers/gpu/drm/msm/dsi/dsi.c +5 -9
@@ -18,9 +18,7 @@ struct drm_encoder *msm_dsi_get_encoder(struct msm_dsi *msm_dsi)if (!msm_dsi || !msm_dsi_device_connected (msm_dsi))return NULL ; -return (msm_dsi->device_flags &MIPI_DSI_MODE_VIDEO ) ? - msm_dsi->encoders[MSM_DSI_VIDEO_ENCODER_ID ] : - msm_dsi->encoders[MSM_DSI_CMD_ENCODER_ID ]; +return msm_dsi->encoder; }static int dsi_get_phy (struct msm_dsi *msm_dsi)
@@ -187,14 +185,13 @@ void __exit msm_dsi_unregister(void) }int msm_dsi_modeset_init (struct msm_dsi *msm_dsi,struct drm_device *dev, -struct drm_encoder *encoders[MSM_DSI_ENCODER_NUM ]) +struct drm_encoder *encoder) {struct msm_drm_private *priv = dev->dev_private;struct drm_bridge *ext_bridge; -int ret, i; +int ret; -if (WARN_ON (!encoders[MSM_DSI_VIDEO_ENCODER_ID ] || - !encoders[MSM_DSI_CMD_ENCODER_ID ])) +if (WARN_ON (!encoder))return -EINVAL ; msm_dsi->dev = dev;
@@ -205,8 +202,7 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, goto fail; } -for (i =0 ; i <MSM_DSI_ENCODER_NUM ; i++) - msm_dsi->encoders[i] = encoders[i]; + msm_dsi->encoder = encoder; msm_dsi->bridge =msm_dsi_manager_bridge_init (msm_dsi->id);if (IS_ERR (msm_dsi->bridge)) {
drivers/gpu/drm/msm/dsi/dsi.h +2 -2
@@ -73,8 +73,8 @@ struct msm_dsi {struct device *phy_dev;bool phy_enabled; -/* the encoders we are hooked to (outside of dsi block) */ -struct drm_encoder *encoders[MSM_DSI_ENCODER_NUM ]; +/* the encoder we are hooked to (outside of dsi block) */ +struct drm_encoder *encoder;int id; };
drivers/gpu/drm/msm/dsi/dsi_manager.c +4 -18
@@ -540,7 +540,7 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id)struct msm_dsi *msm_dsi =dsi_mgr_get_dsi (id);struct drm_connector *connector =NULL ;struct dsi_connector *dsi_connector; -int ret, i; +int ret; dsi_connector =kzalloc (sizeof (*dsi_connector),GFP_KERNEL );if (!dsi_connector)
@@ -566,9 +566,7 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id) connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; -for (i =0 ; i <MSM_DSI_ENCODER_NUM ; i++) -drm_mode_connector_attach_encoder (connector, - msm_dsi->encoders[i]); +drm_mode_connector_attach_encoder (connector, msm_dsi->encoder);return connector; }
@@ -591,13 +589,7 @@ struct drm_bridge *msm_dsi_manager_bridge_init(u8 id) dsi_bridge->id = id; -/* -* HACK: we may not know the external DSI bridge device's mode -* flags here. We'll get to know them only when the device -* attaches to the dsi host. For now, assume the bridge supports -* DSI video mode -*/ - encoder = msm_dsi->encoders[MSM_DSI_VIDEO_ENCODER_ID ]; + encoder = msm_dsi->encoder; bridge = &dsi_bridge->base; bridge->funcs = &dsi_mgr_bridge_funcs;
@@ -628,13 +620,7 @@ struct drm_connector *msm_dsi_manager_ext_bridge_init(u8 id) ext_bridge = msm_dsi->external_bridge =msm_dsi_host_get_bridge (msm_dsi->host); -/* -* HACK: we may not know the external DSI bridge device's mode -* flags here. We'll get to know them only when the device -* attaches to the dsi host. For now, assume the bridge supports -* DSI video mode -*/ - encoder = msm_dsi->encoders[MSM_DSI_VIDEO_ENCODER_ID ]; + encoder = msm_dsi->encoder;/* link the internal dsi bridge to the external bridge */ drm_bridge_attach (encoder, ext_bridge, int_bridge);
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c +12 -16
@@ -260,8 +260,7 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms,struct drm_encoder *encoder;struct drm_connector *connector;struct device_node *panel_node; -struct drm_encoder *dsi_encs[MSM_DSI_ENCODER_NUM ]; -int i, dsi_id; +int dsi_id;int ret;switch (intf_type) {
@@ -322,22 +321,19 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms,if (!priv->dsi[dsi_id])break ; -for (i =0 ; i <MSM_DSI_ENCODER_NUM ; i++) { - dsi_encs[i] =mdp4_dsi_encoder_init (dev); -if (IS_ERR (dsi_encs[i])) { - ret =PTR_ERR (dsi_encs[i]); -dev_err (dev->dev, -"failed to construct DSI encoder: %d\n" , - ret); -return ret; - } - -/* TODO: Add DMA_S later? */ - dsi_encs[i]->possible_crtcs =1 <<DMA_P ; - priv->encoders[priv->num_encoders++] = dsi_encs[i]; + encoder =mdp4_dsi_encoder_init (dev); +if (IS_ERR (encoder)) { + ret =PTR_ERR (encoder); +dev_err (dev->dev, +"failed to construct DSI encoder: %d\n" , ret); +return ret; } - ret =msm_dsi_modeset_init (priv->dsi[dsi_id], dev, dsi_encs); +/* TODO: Add DMA_S later? */ + encoder->possible_crtcs =1 <<DMA_P ; + priv->encoders[priv->num_encoders++] = encoder; + + ret =msm_dsi_modeset_init (priv->dsi[dsi_id], dev, encoder);if (ret) {dev_err (dev->dev,"failed to initialize DSI: %d\n" , ret);
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c +6 -14
@@ -369,9 +369,6 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, int intf_num)case INTF_DSI : {int dsi_id =get_dsi_id_from_intf (hw_cfg, intf_num); -struct drm_encoder *dsi_encs[MSM_DSI_ENCODER_NUM ]; -enum mdp5_intf_mode mode; -int i;if ((dsi_id >=ARRAY_SIZE (priv->dsi)) || (dsi_id <0 )) { dev_err(dev->dev, "failed to find dsi from intf %d\n",
@@ -389,19 +386,14 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, int intf_num)break ; } -for (i =0 ; i <MSM_DSI_ENCODER_NUM ; i++) { - mode = (i ==MSM_DSI_CMD_ENCODER_ID ) ? -MDP5_INTF_DSI_MODE_COMMAND : -MDP5_INTF_DSI_MODE_VIDEO ; - dsi_encs[i] =construct_encoder (mdp5_kms,INTF_DSI , - intf_num, mode, ctl); -if (IS_ERR (dsi_encs[i])) { - ret =PTR_ERR (dsi_encs[i]); -break ; - } + encoder =construct_encoder (mdp5_kms,INTF_DSI , intf_num, +MDP5_INTF_DSI_MODE_VIDEO , ctl); +if (IS_ERR (encoder)) { + ret =PTR_ERR (encoder); +break ; } - ret =msm_dsi_modeset_init (priv->dsi[dsi_id], dev, dsi_encs); + ret =msm_dsi_modeset_init (priv->dsi[dsi_id], dev, encoder);break ; }default :
drivers/gpu/drm/msm/msm_drv.h +3 -8
@@ -275,16 +275,11 @@ int msm_edp_modeset_init(struct msm_edp *edp, struct drm_device *dev, struct drm_encoder *encoder);struct msm_dsi ; -enum msm_dsi_encoder_id { -MSM_DSI_VIDEO_ENCODER_ID =0 , -MSM_DSI_CMD_ENCODER_ID =1 , -MSM_DSI_ENCODER_NUM =2 -};#ifdef CONFIG_DRM_MSM_DSI void __init msm_dsi_register (void ); void __exit msm_dsi_unregister(void);int msm_dsi_modeset_init (struct msm_dsi *msm_dsi,struct drm_device *dev, -struct drm_encoder *encoders[MSM_DSI_ENCODER_NUM ]); +struct drm_encoder *encoder);#else static inline void __init msm_dsi_register (void ) {
@@ -293,8 +288,8 @@ static inline void __exit msm_dsi_unregister(void) { }static inline int msm_dsi_modeset_init (struct msm_dsi *msm_dsi, -struct drm_device *dev, -struct drm_encoder *encoders[MSM_DSI_ENCODER_NUM ]) +struct drm_device *dev, +struct drm_encoder *encoder) {return -EINVAL ; }
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 2/6 drm/msm: Set encoder's mode of operation using a kms func
In reply to Archit TanejaThe mdp5 kms driver currently sets up multiple encoders per interface (INTF), one for each kind of mode of operation it supports. We create 2 drm_encoders for DSI, one for Video Mode and the other for Command Mode operation. The reason behind this approach could have been that we aren't aware of the DSI device's mode of operation when we create the encoders.
This makes things a bit complicated, since these encoders have to be further attached to the same DSI bridge. The easier way out is to create a single encoder, and make the DSI driver set its mode of operation when we know what the DSI device's mode flags are.
Start with providing a way to set the mdp5_intf_mode using a kms func that sets the encoder's mode of operation. When constructing a DSI encoder, we set the mode of operation to Video Mode as default. When the DSI device is attached to the host, we probe the DSI mode flags and set the corresponding mode of operation.
--- drivers/gpu/drm/msm/dsi/dsi.h | 1 + drivers/gpu/drm/msm/dsi/dsi_host.c | 2 ++ drivers/gpu/drm/msm/dsi/dsi_manager.c | 39 ++++++++++++++++++++++++++--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 17 +++++++++++++ drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 8 ++++++ drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 1 + drivers/gpu/drm/msm/msm_kms.h | 3 +++ 7 files changed, 68 insertions(+), 3 deletions(-)
drivers/gpu/drm/msm/dsi/dsi.h +1 -0
@@ -90,6 +90,7 @@ int msm_dsi_manager_phy_enable(int id,void msm_dsi_manager_phy_disable (int id);int msm_dsi_manager_cmd_xfer (int id,const struct mipi_dsi_msg *msg);bool msm_dsi_manager_cmd_xfer_trigger (int id,u32 dma_base,u32 len); +void msm_dsi_manager_attach_dsi_device (int id,u32 device_flags);int msm_dsi_manager_register (struct msm_dsi *msm_dsi);void msm_dsi_manager_unregister (struct msm_dsi *msm_dsi);
drivers/gpu/drm/msm/dsi/dsi_host.c +2 -0
@@ -1482,6 +1482,8 @@ static int dsi_host_attach(struct mipi_dsi_host *host, msm_host->format = dsi->format; msm_host->mode_flags = dsi->mode_flags; +msm_dsi_manager_attach_dsi_device (msm_host->id, dsi->mode_flags); +/* Some gpios defined in panel DT need to be controlled by host */ ret =dsi_host_init_panel_gpios (msm_host, &dsi->dev);if (ret)
drivers/gpu/drm/msm/dsi/dsi_manager.c +36 -3
@@ -155,8 +155,16 @@ static enum drm_connector_status dsi_mgr_connector_detect(DBG ("id=%d" , id);if (!msm_dsi->panel) { +struct drm_encoder *encoder =msm_dsi_get_encoder (msm_dsi); +bool cmd_mode; + msm_dsi->panel =msm_dsi_host_get_panel (msm_dsi->host, - &msm_dsi->device_flags); + &msm_dsi->device_flags); + + cmd_mode = !(msm_dsi->device_flags &MIPI_DSI_MODE_VIDEO ); + +if (kms->funcs->set_encoder_mode) + kms->funcs->set_encoder_mode (kms, encoder, cmd_mode);/* There is only 1 panel in the global panel list * for dual DSI mode. Therefore slave dsi should get
@@ -177,8 +185,6 @@ static enum drm_connector_status dsi_mgr_connector_detect(*/ if (msm_dsi->panel &&IS_DUAL_DSI () && other_dsi && other_dsi->panel) { -bool cmd_mode = !(msm_dsi->device_flags & -MIPI_DSI_MODE_VIDEO );struct drm_encoder *encoder =msm_dsi_get_encoder (dsi_mgr_get_dsi (DSI_ENCODER_MASTER )); struct drm_encoder *slave_enc = msm_dsi_get_encoder(
@@ -773,6 +779,33 @@ bool msm_dsi_manager_cmd_xfer_trigger(int id, u32 dma_base, u32 len)return true; } +void msm_dsi_manager_attach_dsi_device (int id,u32 device_flags) +{ +struct msm_dsi *msm_dsi =dsi_mgr_get_dsi (id); +struct drm_device *dev = msm_dsi->dev; +struct msm_drm_private *priv; +struct msm_kms *kms; +struct drm_encoder *encoder; + +/* +* drm_device pointer is assigned to msm_dsi only in the modeset_init +* path. If mipi_dsi_attach() happens in DSI driver's probe path +* (generally the case when we're connected to a drm_panel of the type +* mipi_dsi_device), this would be NULL. Try to set encoder mode in +* the DSI connector's detect() op. +*/ +if (!dev) +return ; + + priv = dev->dev_private; + kms = priv->kms; + encoder =msm_dsi_get_encoder (msm_dsi); + +if (encoder && kms->funcs->set_encoder_mode) +if (!(device_flags &MIPI_DSI_MODE_VIDEO )) + kms->funcs->set_encoder_mode (kms, encoder, true); +} +int msm_dsi_manager_register (struct msm_dsi *msm_dsi) {struct msm_dsi_manager *msm_dsim = &msm_dsim_glb;
drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c +17 -0
@@ -342,6 +342,23 @@ int mdp5_encoder_set_split_display(struct drm_encoder *encoder,return 0 ; } +void mdp5_encoder_set_intf_mode (struct drm_encoder *encoder,bool cmd_mode) +{ +struct mdp5_encoder *mdp5_encoder =to_mdp5_encoder (encoder); +struct mdp5_interface *intf = &mdp5_encoder->intf; + +/* TODO: Expand this to set writeback modes too */ +if (cmd_mode) { +WARN_ON (intf->type !=INTF_DSI ); + intf->mode =MDP5_INTF_DSI_MODE_COMMAND ; + }else { +if (intf->type ==INTF_DSI ) + intf->mode =MDP5_INTF_DSI_MODE_VIDEO ; +else + intf->mode =MDP5_INTF_MODE_NONE ; + } +} +/* initialize encoder */ struct drm_encoder *mdp5_encoder_init (struct drm_device *dev,struct mdp5_interface *intf,struct mdp5_ctl *ctl)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c +8 -0
@@ -151,6 +151,13 @@ static int mdp5_set_split_display(struct msm_kms *kms,return mdp5_encoder_set_split_display (encoder, slave_encoder); } +static void mdp5_set_encoder_mode (struct msm_kms *kms, +struct drm_encoder *encoder, +bool cmd_mode) +{ +mdp5_encoder_set_intf_mode (encoder, cmd_mode); +} +static void mdp5_kms_destroy (struct msm_kms *kms) {struct mdp5_kms *mdp5_kms =to_mdp5_kms (to_mdp_kms (kms));
@@ -230,6 +237,7 @@ static const struct mdp_kms_funcs kms_funcs = { .get_format = mdp_get_format, .round_pixclk = mdp5_round_pixclk, .set_split_display = mdp5_set_split_display, + .set_encoder_mode = mdp5_set_encoder_mode, .destroy = mdp5_kms_destroy, #ifdef CONFIG_DEBUG_FS .debugfs_init = mdp5_kms_debugfs_init,
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h +1 -0
@@ -246,6 +246,7 @@ struct drm_encoder *mdp5_encoder_init(struct drm_device *dev, struct mdp5_interface *intf, struct mdp5_ctl *ctl);int mdp5_encoder_set_split_display (struct drm_encoder *encoder,struct drm_encoder *slave_encoder); +void mdp5_encoder_set_intf_mode (struct drm_encoder *encoder,bool cmd_mode);int mdp5_encoder_get_linecount (struct drm_encoder *encoder);u32 mdp5_encoder_get_framecount (struct drm_encoder *encoder);
drivers/gpu/drm/msm/msm_kms.h +3 -0
@@ -56,6 +56,9 @@ struct msm_kms_funcs {struct drm_encoder *encoder, struct drm_encoder *slave_encoder, bool is_cmd_mode); +void (*set_encoder_mode)(struct msm_kms *kms, +struct drm_encoder *encoder, +bool cmd_mode);/* cleanup: */ void (*destroy)(struct msm_kms *kms);#ifdef CONFIG_DEBUG_FS
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 3/6 drm/msm/mdp5: Prepare for merging video and command encoders
In reply to Archit TanejaRename the mdp5_encoder_* ops for active displays to mdp5_vid_encoder_* ops.
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 31 ++++++++++++++++++++++------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 3 ++- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 4 ++-- 3 files changed, 28 insertions(+), 10 deletions(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c +24 -7
@@ -112,9 +112,9 @@ static const struct drm_encoder_funcs mdp5_encoder_funcs = { .destroy = mdp5_encoder_destroy, }; -static void mdp5_encoder_mode_set (struct drm_encoder *encoder, -struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode) +static void mdp5_vid_encoder_mode_set (struct drm_encoder *encoder, +struct drm_display_mode *mode, +struct drm_display_mode *adjusted_mode) {struct mdp5_encoder *mdp5_encoder =to_mdp5_encoder (encoder);struct mdp5_kms *mdp5_kms =get_kms (encoder);
@@ -221,7 +221,7 @@ static void mdp5_encoder_mode_set(struct drm_encoder *encoder, mdp5_encoder->ctl); } -static void mdp5_encoder_disable (struct drm_encoder *encoder) +static void mdp5_vid_encoder_disable (struct drm_encoder *encoder) {struct mdp5_encoder *mdp5_encoder =to_mdp5_encoder (encoder);struct mdp5_kms *mdp5_kms =get_kms (encoder);
@@ -256,7 +256,7 @@ static void mdp5_encoder_disable(struct drm_encoder *encoder) mdp5_encoder->enabled = false; } -static void mdp5_encoder_enable (struct drm_encoder *encoder) +static void mdp5_vid_encoder_enable (struct drm_encoder *encoder) {struct mdp5_encoder *mdp5_encoder =to_mdp5_encoder (encoder);struct mdp5_kms *mdp5_kms =get_kms (encoder);
@@ -279,6 +279,23 @@ static void mdp5_encoder_enable(struct drm_encoder *encoder) mdp5_encoder->enabled = true; } +static void mdp5_encoder_mode_set (struct drm_encoder *encoder, +struct drm_display_mode *mode, +struct drm_display_mode *adjusted_mode) +{ +mdp5_vid_encoder_mode_set (encoder, mode, adjusted_mode); +} + +static void mdp5_encoder_disable (struct drm_encoder *encoder) +{ +mdp5_vid_encoder_disable (encoder); +} + +static void mdp5_encoder_enable (struct drm_encoder *encoder) +{ +mdp5_vid_encoder_enable (encoder); +} +static const struct drm_encoder_helper_funcs mdp5_encoder_helper_funcs = { .mode_set = mdp5_encoder_mode_set, .disable = mdp5_encoder_disable,
@@ -303,8 +320,8 @@ u32 mdp5_encoder_get_framecount(struct drm_encoder *encoder)return mdp5_read (mdp5_kms,REG_MDP5_INTF_FRAME_COUNT (intf)); } -int mdp5_encoder_set_split_display (struct drm_encoder *encoder, -struct drm_encoder *slave_encoder) +int mdp5_vid_encoder_set_split_display (struct drm_encoder *encoder, +struct drm_encoder *slave_encoder) {struct mdp5_encoder *mdp5_encoder =to_mdp5_encoder (encoder);struct mdp5_encoder *mdp5_slave_enc =to_mdp5_encoder (slave_encoder);
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c +2 -1
@@ -148,7 +148,8 @@ static int mdp5_set_split_display(struct msm_kms *kms,return mdp5_cmd_encoder_set_split_display (encoder, slave_encoder); else - return mdp5_encoder_set_split_display(encoder, slave_encoder); + return mdp5_vid_encoder_set_split_display(encoder, +slave_encoder ); } static void mdp5_set_encoder_mode(struct msm_kms *kms,
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h +2 -2
@@ -244,8 +244,8 @@ struct drm_crtc *mdp5_crtc_init(struct drm_device *dev,struct drm_encoder *mdp5_encoder_init (struct drm_device *dev,struct mdp5_interface *intf,struct mdp5_ctl *ctl); -int mdp5_encoder_set_split_display (struct drm_encoder *encoder, -struct drm_encoder *slave_encoder); +int mdp5_vid_encoder_set_split_display (struct drm_encoder *encoder, +struct drm_encoder *slave_encoder);void mdp5_encoder_set_intf_mode (struct drm_encoder *encoder,bool cmd_mode);int mdp5_encoder_get_linecount (struct drm_encoder *encoder);u32 mdp5_encoder_get_framecount (struct drm_encoder *encoder);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 4/6 drm/msm/mdp5: Create single encoder per interface (INTF)
In reply to Archit TanejaFor the DSI interfaces, the mdp5_kms core creates 2 encoders for video and command modes.
Create only a single encoder per interface. When creating the encoder, set the interface type to MDP5_INTF_MODE_NONE. It's the bridge (DSI/HDMI/eDP) driver's responsibility to set a different interface type. It can use the the kms func op set_encoder_mode to change the mode of operation, which in turn would configure the interface type for the INTF.
In mdp5_cmd_encoder.c, we remove the redundant code, and make the commmand mode funcs as helpers that are used in mdp5_encoder.c
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 135 +++--------------------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 35 +++--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 20 ++-- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 32 ++++-- 4 files changed, 66 insertions(+), 156 deletions(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c +13 -122
@@ -16,16 +16,6 @@#include "drm_crtc.h" #include "drm_crtc_helper.h" -struct mdp5_cmd_encoder { -struct drm_encoder base; -struct mdp5_interface intf; -bool enabled; -uint32_t bsc; - -struct mdp5_ctl *ctl; -}; -#define to_mdp5_cmd_encoder (x) container_of(x, struct mdp5_cmd_encoder, base) -static struct mdp5_kms *get_kms (struct drm_encoder *encoder) {struct msm_drm_private *priv = encoder->dev->dev_private;
@@ -36,47 +26,8 @@ static struct mdp5_kms *get_kms(struct drm_encoder *encoder)#include <mach/board.h> #include <linux/msm-bus.h> #include <linux/msm-bus-board.h> -#define MDP_BUS_VECTOR_ENTRY (ab_val, ib_val) \ - { \ - .src = MSM_BUS_MASTER_MDP_PORT0, \ - .dst = MSM_BUS_SLAVE_EBI_CH0, \ - .ab = (ab_val), \ - .ib = (ib_val), \ - } - -static struct msm_bus_vectors mdp_bus_vectors[] = { -MDP_BUS_VECTOR_ENTRY (0 ,0 ), -MDP_BUS_VECTOR_ENTRY (2000000000 ,2000000000 ), -}; -static struct msm_bus_paths mdp_bus_usecases[] = { { - .num_paths =1 , - .vectors = &mdp_bus_vectors[0 ], -}, { - .num_paths =1 , - .vectors = &mdp_bus_vectors[1 ], -} }; -static struct msm_bus_scale_pdata mdp_bus_scale_table = { - .usecase = mdp_bus_usecases, - .num_usecases =ARRAY_SIZE (mdp_bus_usecases), - .name ="mdss_mdp" , -}; - -static void bs_init (struct mdp5_cmd_encoder *mdp5_cmd_enc) -{ - mdp5_cmd_enc->bsc =msm_bus_scale_register_client ( - &mdp_bus_scale_table); -DBG ("bus scale client: %08x" , mdp5_cmd_enc->bsc); -} - -static void bs_fini (struct mdp5_cmd_encoder *mdp5_cmd_enc) -{ -if (mdp5_cmd_enc->bsc) { -msm_bus_scale_unregister_client (mdp5_cmd_enc->bsc); - mdp5_cmd_enc->bsc =0 ; - } -} -static void bs_set (struct mdp5_cmd_encoder *mdp5_cmd_enc,int idx) +static void bs_set (struct mdp5_encoder *mdp5_cmd_enc,int idx) {if (mdp5_cmd_enc->bsc) {DBG ("set bus scaling: %d" , idx);
@@ -89,14 +40,12 @@ static void bs_set(struct mdp5_cmd_encoder *mdp5_cmd_enc, int idx) } }#else -static void bs_init (struct mdp5_cmd_encoder *mdp5_cmd_enc) {} -static void bs_fini (struct mdp5_cmd_encoder *mdp5_cmd_enc) {} -static void bs_set (struct mdp5_cmd_encoder *mdp5_cmd_enc,int idx) {} +static void bs_set (struct mdp5_encoder *mdp5_cmd_enc,int idx) {}#endif #define VSYNC_CLK_RATE 19200000static int pingpong_tearcheck_setup (struct drm_encoder *encoder, -struct drm_display_mode *mode) +struct drm_display_mode *mode) {struct mdp5_kms *mdp5_kms =get_kms (encoder);struct device *dev = encoder->dev->dev;
@@ -176,23 +125,11 @@ static void pingpong_tearcheck_disable(struct drm_encoder *encoder)clk_disable_unprepare (mdp5_kms->vsync_clk); } -static void mdp5_cmd_encoder_destroy (struct drm_encoder *encoder) -{ -struct mdp5_cmd_encoder *mdp5_cmd_enc =to_mdp5_cmd_encoder (encoder); -bs_fini (mdp5_cmd_enc); -drm_encoder_cleanup (encoder); -kfree (mdp5_cmd_enc); -} - -static const struct drm_encoder_funcs mdp5_cmd_encoder_funcs = { - .destroy = mdp5_cmd_encoder_destroy, -}; - -static void mdp5_cmd_encoder_mode_set (struct drm_encoder *encoder, -struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode) +void mdp5_cmd_encoder_mode_set (struct drm_encoder *encoder, +struct drm_display_mode *mode, +struct drm_display_mode *adjusted_mode) { -struct mdp5_cmd_encoder *mdp5_cmd_enc =to_mdp5_cmd_encoder (encoder); +struct mdp5_encoder *mdp5_cmd_enc =to_mdp5_encoder (encoder); mode = adjusted_mode;
@@ -209,9 +146,9 @@ static void mdp5_cmd_encoder_mode_set(struct drm_encoder *encoder, mdp5_cmd_enc->ctl); } -static void mdp5_cmd_encoder_disable (struct drm_encoder *encoder) +void mdp5_cmd_encoder_disable (struct drm_encoder *encoder) { -struct mdp5_cmd_encoder *mdp5_cmd_enc =to_mdp5_cmd_encoder (encoder); +struct mdp5_encoder *mdp5_cmd_enc =to_mdp5_encoder (encoder);struct mdp5_ctl *ctl = mdp5_cmd_enc->ctl;struct mdp5_interface *intf = &mdp5_cmd_enc->intf;
@@ -228,9 +165,9 @@ static void mdp5_cmd_encoder_disable(struct drm_encoder *encoder) mdp5_cmd_enc->enabled = false; } -static void mdp5_cmd_encoder_enable (struct drm_encoder *encoder) +void mdp5_cmd_encoder_enable (struct drm_encoder *encoder) { -struct mdp5_cmd_encoder *mdp5_cmd_enc =to_mdp5_cmd_encoder (encoder); +struct mdp5_encoder *mdp5_cmd_enc =to_mdp5_encoder (encoder);struct mdp5_ctl *ctl = mdp5_cmd_enc->ctl;struct mdp5_interface *intf = &mdp5_cmd_enc->intf;
@@ -248,16 +185,10 @@ static void mdp5_cmd_encoder_enable(struct drm_encoder *encoder) mdp5_cmd_enc->enabled = true; } -static const struct drm_encoder_helper_funcs mdp5_cmd_encoder_helper_funcs = { - .mode_set = mdp5_cmd_encoder_mode_set, - .disable = mdp5_cmd_encoder_disable, - .enable = mdp5_cmd_encoder_enable, -}; -int mdp5_cmd_encoder_set_split_display (struct drm_encoder *encoder, -struct drm_encoder *slave_encoder) +struct drm_encoder *slave_encoder) { -struct mdp5_cmd_encoder *mdp5_cmd_enc =to_mdp5_cmd_encoder (encoder); +struct mdp5_encoder *mdp5_cmd_enc =to_mdp5_encoder (encoder);struct mdp5_kms *mdp5_kms;int intf_num;u32 data =0 ;
@@ -292,43 +223,3 @@ int mdp5_cmd_encoder_set_split_display(struct drm_encoder *encoder,return 0 ; } - -/* initialize command mode encoder */ -struct drm_encoder *mdp5_cmd_encoder_init (struct drm_device *dev, -struct mdp5_interface *intf,struct mdp5_ctl *ctl) -{ -struct drm_encoder *encoder =NULL ; -struct mdp5_cmd_encoder *mdp5_cmd_enc; -int ret; - -if (WARN_ON ((intf->type !=INTF_DSI ) && - (intf->mode !=MDP5_INTF_DSI_MODE_COMMAND ))) { - ret = -EINVAL ; - goto fail; - } - - mdp5_cmd_enc =kzalloc (sizeof (*mdp5_cmd_enc),GFP_KERNEL ); -if (!mdp5_cmd_enc) { - ret = -ENOMEM ; - goto fail; - } - -memcpy (&mdp5_cmd_enc->intf, intf,sizeof (mdp5_cmd_enc->intf)); - encoder = &mdp5_cmd_enc->base; - mdp5_cmd_enc->ctl = ctl; - -drm_encoder_init (dev, encoder, &mdp5_cmd_encoder_funcs, -DRM_MODE_ENCODER_DSI ,NULL ); - -drm_encoder_helper_add (encoder, &mdp5_cmd_encoder_helper_funcs); - -bs_init (mdp5_cmd_enc); - -return encoder; - -fail: -if (encoder) -mdp5_cmd_encoder_destroy (encoder); - -return ERR_PTR (ret); -}
drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c +21 -14
@@ -21,17 +21,6 @@#include "drm_crtc.h" #include "drm_crtc_helper.h" -struct mdp5_encoder { -struct drm_encoder base; -struct mdp5_interface intf; -spinlock_t intf_lock;/* protect REG_MDP5_INTF_* registers */ -bool enabled; -uint32_t bsc; - -struct mdp5_ctl *ctl; -}; -#define to_mdp5_encoder (x) container_of(x, struct mdp5_encoder, base) -static struct mdp5_kms *get_kms (struct drm_encoder *encoder) {struct msm_drm_private *priv = encoder->dev->dev_private;
@@ -283,17 +272,35 @@ static void mdp5_encoder_mode_set(struct drm_encoder *encoder,struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) { -mdp5_vid_encoder_mode_set (encoder ,mode ,adjusted_mode ); + struct mdp5_encoder *mdp5_encoder = to_mdp5_encoder(encoder); +struct mdp5_interface *intf = &mdp5_encoder->intf; + +if (intf->mode ==MDP5_INTF_DSI_MODE_COMMAND ) +mdp5_cmd_encoder_mode_set (encoder, mode, adjusted_mode); +else +mdp5_vid_encoder_mode_set (encoder, mode, adjusted_mode); }static void mdp5_encoder_disable (struct drm_encoder *encoder) { -mdp5_vid_encoder_disable (encoder); +struct mdp5_encoder *mdp5_encoder =to_mdp5_encoder (encoder); +struct mdp5_interface *intf = &mdp5_encoder->intf; + +if (intf->mode ==MDP5_INTF_DSI_MODE_COMMAND ) +mdp5_cmd_encoder_disable (encoder); +else +mdp5_vid_encoder_disable (encoder); }static void mdp5_encoder_enable (struct drm_encoder *encoder) { -mdp5_vid_encoder_enable (encoder); +struct mdp5_encoder *mdp5_encoder =to_mdp5_encoder (encoder); +struct mdp5_interface *intf = &mdp5_encoder->intf; + +if (intf->mode ==MDP5_INTF_DSI_MODE_COMMAND ) +mdp5_cmd_encoder_disable (encoder); +else +mdp5_vid_encoder_enable (encoder); } static const struct drm_encoder_helper_funcs mdp5_encoder_helper_funcs = {
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c +6 -14
@@ -276,7 +276,7 @@ int mdp5_enable(struct mdp5_kms *mdp5_kms)static struct drm_encoder *construct_encoder (struct mdp5_kms *mdp5_kms,enum mdp5_intf_type intf_type,int intf_num, -enum mdp5_intf_mode intf_mode,struct mdp5_ctl *ctl) +struct mdp5_ctl *ctl) {struct drm_device *dev = mdp5_kms->dev;struct msm_drm_private *priv = dev->dev_private;
@@ -284,15 +284,10 @@ static struct drm_encoder *construct_encoder(struct mdp5_kms *mdp5_kms,struct mdp5_interface intf = { .num = intf_num, .type = intf_type, - .mode = intf_mode, + .mode =MDP5_INTF_MODE_NONE , }; -if ((intf_type ==INTF_DSI ) && - (intf_mode ==MDP5_INTF_DSI_MODE_COMMAND )) - encoder =mdp5_cmd_encoder_init (dev, &intf, ctl); -else - encoder =mdp5_encoder_init (dev, &intf, ctl); - + encoder =mdp5_encoder_init (dev, &intf, ctl);if (IS_ERR (encoder)) {dev_err (dev->dev,"failed to construct encoder\n" );return encoder;
@@ -347,8 +342,7 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, int intf_num)break ; } - encoder =construct_encoder (mdp5_kms, INTF_eDP, intf_num, -MDP5_INTF_MODE_NONE , ctl); + encoder =construct_encoder (mdp5_kms, INTF_eDP, intf_num, ctl);if (IS_ERR (encoder)) { ret =PTR_ERR (encoder);break ;
@@ -366,8 +360,7 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, int intf_num)break ; } - encoder =construct_encoder (mdp5_kms,INTF_HDMI , intf_num, -MDP5_INTF_MODE_NONE , ctl); + encoder =construct_encoder (mdp5_kms,INTF_HDMI , intf_num, ctl);if (IS_ERR (encoder)) { ret =PTR_ERR (encoder);break ;
@@ -395,8 +388,7 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, int intf_num)break ; } - encoder =construct_encoder (mdp5_kms,INTF_DSI , intf_num, -MDP5_INTF_DSI_MODE_VIDEO , ctl); + encoder =construct_encoder (mdp5_kms,INTF_DSI , intf_num, ctl);if (IS_ERR (encoder)) { ret =PTR_ERR (encoder);break ;
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h +26 -6
@@ -126,6 +126,17 @@ struct mdp5_interface {enum mdp5_intf_mode mode; }; +struct mdp5_encoder { +struct drm_encoder base; +struct mdp5_interface intf; +spinlock_t intf_lock;/* protect REG_MDP5_INTF_* registers */ +bool enabled; +uint32_t bsc; + +struct mdp5_ctl *ctl; +}; +#define to_mdp5_encoder (x) container_of(x, struct mdp5_encoder, base) +static inline void mdp5_write (struct mdp5_kms *mdp5_kms,u32 reg,u32 data) {msm_writel (data, mdp5_kms->mmio + reg);
@@ -251,15 +262,24 @@ int mdp5_encoder_get_linecount(struct drm_encoder *encoder);u32 mdp5_encoder_get_framecount (struct drm_encoder *encoder);#ifdef CONFIG_DRM_MSM_DSI -struct drm_encoder *mdp5_cmd_encoder_init (struct drm_device *dev, -struct mdp5_interface *intf,struct mdp5_ctl *ctl); +void mdp5_cmd_encoder_mode_set (struct drm_encoder *encoder, +struct drm_display_mode *mode, +struct drm_display_mode *adjusted_mode); +void mdp5_cmd_encoder_disable (struct drm_encoder *encoder); +void mdp5_cmd_encoder_enable (struct drm_encoder *encoder);int mdp5_cmd_encoder_set_split_display (struct drm_encoder *encoder, -struct drm_encoder *slave_encoder); +struct drm_encoder *slave_encoder);#else -static inline struct drm_encoder *mdp5_cmd_encoder_init (struct drm_device *dev, -struct mdp5_interface *intf,struct mdp5_ctl *ctl) +static inline void mdp5_cmd_encoder_mode_set (struct drm_encoder *encoder, +struct drm_display_mode *mode, +struct drm_display_mode *adjusted_mode) +{ +} +static inline void mdp5_cmd_encoder_disable (struct drm_encoder *encoder) +{ +} +static inline void mdp5_cmd_encoder_enable (struct drm_encoder *encoder) { -return ERR_PTR (-EINVAL ); }static inline int mdp5_cmd_encoder_set_split_display (struct drm_encoder *encoder,struct drm_encoder *slave_encoder)
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 5/6 drm/msm/mdp5: cfg: Change count to unsigned int
In reply to Archit TanejaCount can't be non-zero. Changing to uint will also prevent future warnings.
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h +1 -1
@@ -32,7 +32,7 @@ extern const struct mdp5_cfg_hw *mdp5_cfg; typedef DECLARE_BITMAP(mdp5_smp_state_t, MAX_SMP_BLOCKS);#define MDP5_SUB_BLOCK_DEFINITION \ - int count; \ + unsigned int count; \ uint32_t base[MAX_BASES]struct mdp5_sub_block {
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 6/6 drm/msm/mdp5: Create only as many CRTCs as we need
In reply to Archit TanejaWe currently create CRTCs equaling to the # of Layer Mixer blocks we have on the MDP5 HW. This number is generally more than the # of encoders (INTFs) we have in the MDSS HW. The number of encoders connected to displays on the platform (as described by DT) would be even lesser.
Create only N drm_crtcs, where N is the number of drm_encoders successfully registered. To do this, we call modeset_init_intf() before we init the drm_crtcs and drm_planes.
Because of this change, setting encoder->possible_crtcs needs to be moved from construct_encoder() to a later point when we know how many CRTCs we have.
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 39 ++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 10 deletions(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c +29 -10
@@ -293,7 +293,6 @@ static struct drm_encoder *construct_encoder(struct mdp5_kms *mdp5_kms,return encoder; } - encoder->possible_crtcs = (1 << priv->num_crtcs) -1 ; priv->encoders[priv->num_encoders++] = encoder;return encoder;
@@ -411,16 +410,35 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)struct drm_device *dev = mdp5_kms->dev;struct msm_drm_private *priv = dev->dev_private;const struct mdp5_cfg_hw *hw_cfg; +unsigned int num_crtcs;int i, ret; hw_cfg =mdp5_cfg_get_hw_config (mdp5_kms->cfg); -/* Construct planes equaling the number of hw pipes, and CRTCs -* for the N layer-mixers (LM). The first N planes become primary +/* +* Construct encoders and modeset initialize connector devices +* for each external display interface. +*/ +for (i =0 ; i <ARRAY_SIZE (hw_cfg->intf.connect); i++) { + ret =modeset_init_intf (mdp5_kms, i); +if (ret) + goto fail; + } + +/* +* We should ideally have less number of encoders (set up by parsing +* the MDP5 interfaces) than the number of layer mixers present in HW, +* but let's be safe here anyway +*/ + num_crtcs =min (priv->num_encoders, mdp5_cfg->lm.count); + +/* +* Construct planes equaling the number of hw pipes, and CRTCs for the +* N encoders set up by the driver. The first N planes become primary * planes for the CRTCs, with the remainder as overlay planes: */ for (i =0 ; i < mdp5_kms->num_hwpipes; i++) { -bool primary = i < mdp5_cfg->lm.count; +bool primary = i < num_crtcs;struct drm_plane *plane;struct drm_crtc *crtc;
@@ -444,13 +462,14 @@ static int modeset_init(struct mdp5_kms *mdp5_kms) priv->crtcs[priv->num_crtcs++] = crtc; } -/* Construct encoders and modeset initialize connector devices -* for each external display interface. +/* +* Now that we know the number of crtcs we've created, set the possible +* crtcs for the encoders */ -for (i =0 ; i <ARRAY_SIZE (hw_cfg->intf.connect); i++) { - ret =modeset_init_intf (mdp5_kms, i); -if (ret) - goto fail; +for (i =0 ; i < priv->num_encoders; i++) { +struct drm_encoder *encoder = priv->encoders[i]; + + encoder->possible_crtcs = (1 << priv->num_crtcs) -1 ; }return 0 ;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation