| Message ID | 20201208122855.254819-8-tomi.valkeinen@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Convert DSI code to use drm_mipi_dsi and drm_panel (second half) | expand |
Hi, On Tue, Dec 08, 2020 at 02:28:33PM +0200, Tomi Valkeinen wrote: > The VC handling has gotten quite tangled up. As the first step to clean > it up, lets define that we only support a single DSI peripheral (which > was really already the case), and we always use VC0 (define VC_DEFAULT > 0) register block to send data to the peripheral. > > We can thus have a single mipi_dsi_device pointer and remove the > for-loops which made passes over all the four VCs (just the first one > was ever used). > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> -- Sebastian > drivers/gpu/drm/omapdrm/dss/dsi.c | 49 ++++++++----------------------- > 1 file changed, 13 insertions(+), 36 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c > index c6e044f8bece..5e13478010db 100644 > --- a/drivers/gpu/drm/omapdrm/dss/dsi.c > +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c > @@ -360,9 +360,10 @@ struct dsi_data { > bool vdds_dsi_enabled; > struct regulator *vdds_dsi_reg; > > + struct mipi_dsi_device *dsidev; > + > struct { > enum dsi_vc_source source; > - struct mipi_dsi_device *dest; > enum fifo_size tx_fifo_size; > enum fifo_size rx_fifo_size; > } vc[4]; > @@ -452,6 +453,8 @@ static bool dsi_perf; > module_param(dsi_perf, bool, 0644); > #endif > > +#define VC_DEFAULT 0 > + > #define drm_bridge_to_dsi(bridge) \ > container_of(bridge, struct dsi_data, bridge) > > @@ -3716,16 +3719,11 @@ static void dsi_disable_video_output(struct omap_dss_device *dssdev, int channel > static void dsi_disable_video_outputs(struct omap_dss_device *dssdev) > { > struct dsi_data *dsi = to_dsi_data(dssdev); > - unsigned int i; > > dsi_bus_lock(dsi); > dsi->video_enabled = false; > > - for (i = 0; i < 4; i++) { > - if (!dsi->vc[i].dest) > - continue; > - dsi_disable_video_output(dssdev, i); > - } > + dsi_disable_video_output(dssdev, VC_DEFAULT); > > dsi_display_disable(dssdev); > > @@ -3914,11 +3912,6 @@ static int dsi_update_channel(struct omap_dss_device *dssdev, int channel) > goto err; > } > > - if (!dsi->vc[channel].dest) { > - r = -ENODEV; > - goto err; > - } > - > if (dsi->vm.hactive == 0 || dsi->vm.vactive == 0) { > r = -EINVAL; > goto err; > @@ -3959,16 +3952,7 @@ static int dsi_update_channel(struct omap_dss_device *dssdev, int channel) > > static int dsi_update_all(struct omap_dss_device *dssdev) > { > - unsigned int i; > - int r; > - > - for (i = 0; i < 4; i++) { > - r = dsi_update_channel(dssdev, i); > - if (r && r != -ENODEV) > - return r; > - } > - > - return r; > + return dsi_update_channel(dssdev, VC_DEFAULT); > } > > /* Display funcs */ > @@ -4196,17 +4180,12 @@ static void dsi_display_enable(struct omap_dss_device *dssdev) > static void dsi_enable_video_outputs(struct omap_dss_device *dssdev) > { > struct dsi_data *dsi = to_dsi_data(dssdev); > - unsigned int i; > > dsi_bus_lock(dsi); > > dsi_display_enable(dssdev); > > - for (i = 0; i < 4; i++) { > - if (!dsi->vc[i].dest) > - continue; > - dsi_enable_video_output(dssdev, i); > - } > + dsi_enable_video_output(dssdev, VC_DEFAULT); > > dsi->video_enabled = true; > > @@ -5095,8 +5074,8 @@ static int omap_dsi_host_attach(struct mipi_dsi_host *host, > if (channel > 3) > return -EINVAL; > > - if (dsi->vc[channel].dest) { > - DSSERR("cannot get VC for display %s", dev_name(&client->dev)); > + if (dsi->dsidev) { > + DSSERR("dsi client already attached\n"); > return -EBUSY; > } > > @@ -5117,7 +5096,7 @@ static int omap_dsi_host_attach(struct mipi_dsi_host *host, > dsi->mode = OMAP_DSS_DSI_CMD_MODE; > } > > - dsi->vc[channel].dest = client; > + dsi->dsidev = client; > dsi->pix_fmt = client->format; > > INIT_DEFERRABLE_WORK(&dsi->ulps_work, > @@ -5149,11 +5128,11 @@ static int omap_dsi_host_detach(struct mipi_dsi_host *host, > if (channel > 3) > return -EINVAL; > > - if (dsi->vc[channel].dest != client) > + if (WARN_ON(dsi->dsidev != client)) > return -EINVAL; > > omap_dsi_unregister_te_irq(dsi); > - dsi->vc[channel].dest = NULL; > + dsi->dsidev = NULL; > return 0; > } > > @@ -5685,10 +5664,8 @@ static int dsi_probe(struct platform_device *pdev) > } > > /* DSI VCs initialization */ > - for (i = 0; i < ARRAY_SIZE(dsi->vc); i++) { > + for (i = 0; i < ARRAY_SIZE(dsi->vc); i++) > dsi->vc[i].source = DSI_VC_SOURCE_L4; > - dsi->vc[i].dest = NULL; > - } > > r = dsi_get_clocks(dsi); > if (r) > -- > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. > Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki >
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index c6e044f8bece..5e13478010db 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -360,9 +360,10 @@ struct dsi_data { bool vdds_dsi_enabled; struct regulator *vdds_dsi_reg; + struct mipi_dsi_device *dsidev; + struct { enum dsi_vc_source source; - struct mipi_dsi_device *dest; enum fifo_size tx_fifo_size; enum fifo_size rx_fifo_size; } vc[4]; @@ -452,6 +453,8 @@ static bool dsi_perf; module_param(dsi_perf, bool, 0644); #endif +#define VC_DEFAULT 0 + #define drm_bridge_to_dsi(bridge) \ container_of(bridge, struct dsi_data, bridge) @@ -3716,16 +3719,11 @@ static void dsi_disable_video_output(struct omap_dss_device *dssdev, int channel static void dsi_disable_video_outputs(struct omap_dss_device *dssdev) { struct dsi_data *dsi = to_dsi_data(dssdev); - unsigned int i; dsi_bus_lock(dsi); dsi->video_enabled = false; - for (i = 0; i < 4; i++) { - if (!dsi->vc[i].dest) - continue; - dsi_disable_video_output(dssdev, i); - } + dsi_disable_video_output(dssdev, VC_DEFAULT); dsi_display_disable(dssdev); @@ -3914,11 +3912,6 @@ static int dsi_update_channel(struct omap_dss_device *dssdev, int channel) goto err; } - if (!dsi->vc[channel].dest) { - r = -ENODEV; - goto err; - } - if (dsi->vm.hactive == 0 || dsi->vm.vactive == 0) { r = -EINVAL; goto err; @@ -3959,16 +3952,7 @@ static int dsi_update_channel(struct omap_dss_device *dssdev, int channel) static int dsi_update_all(struct omap_dss_device *dssdev) { - unsigned int i; - int r; - - for (i = 0; i < 4; i++) { - r = dsi_update_channel(dssdev, i); - if (r && r != -ENODEV) - return r; - } - - return r; + return dsi_update_channel(dssdev, VC_DEFAULT); } /* Display funcs */ @@ -4196,17 +4180,12 @@ static void dsi_display_enable(struct omap_dss_device *dssdev) static void dsi_enable_video_outputs(struct omap_dss_device *dssdev) { struct dsi_data *dsi = to_dsi_data(dssdev); - unsigned int i; dsi_bus_lock(dsi); dsi_display_enable(dssdev); - for (i = 0; i < 4; i++) { - if (!dsi->vc[i].dest) - continue; - dsi_enable_video_output(dssdev, i); - } + dsi_enable_video_output(dssdev, VC_DEFAULT); dsi->video_enabled = true; @@ -5095,8 +5074,8 @@ static int omap_dsi_host_attach(struct mipi_dsi_host *host, if (channel > 3) return -EINVAL; - if (dsi->vc[channel].dest) { - DSSERR("cannot get VC for display %s", dev_name(&client->dev)); + if (dsi->dsidev) { + DSSERR("dsi client already attached\n"); return -EBUSY; } @@ -5117,7 +5096,7 @@ static int omap_dsi_host_attach(struct mipi_dsi_host *host, dsi->mode = OMAP_DSS_DSI_CMD_MODE; } - dsi->vc[channel].dest = client; + dsi->dsidev = client; dsi->pix_fmt = client->format; INIT_DEFERRABLE_WORK(&dsi->ulps_work, @@ -5149,11 +5128,11 @@ static int omap_dsi_host_detach(struct mipi_dsi_host *host, if (channel > 3) return -EINVAL; - if (dsi->vc[channel].dest != client) + if (WARN_ON(dsi->dsidev != client)) return -EINVAL; omap_dsi_unregister_te_irq(dsi); - dsi->vc[channel].dest = NULL; + dsi->dsidev = NULL; return 0; } @@ -5685,10 +5664,8 @@ static int dsi_probe(struct platform_device *pdev) } /* DSI VCs initialization */ - for (i = 0; i < ARRAY_SIZE(dsi->vc); i++) { + for (i = 0; i < ARRAY_SIZE(dsi->vc); i++) dsi->vc[i].source = DSI_VC_SOURCE_L4; - dsi->vc[i].dest = NULL; - } r = dsi_get_clocks(dsi); if (r)