| Message ID | 20201208122855.254819-27-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:52PM +0200, Tomi Valkeinen wrote: > The driver ignores MIPI_DSI_CLOCK_NON_CONTINUOUS, and always uses > non-continuous clock. > > Fix this by using MIPI_DSI_CLOCK_NON_CONTINUOUS and at the same time, > drop ddr_clk_always_on field which seems pretty useless. > > 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 | 12 +++++------- > drivers/gpu/drm/omapdrm/dss/dsi.h | 2 -- > 2 files changed, 5 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c > index 71de6119d2de..cc8b169b2223 100644 > --- a/drivers/gpu/drm/omapdrm/dss/dsi.c > +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c > @@ -1734,11 +1734,10 @@ static int dsi_cio_init(struct dsi_data *dsi) > > dsi_cio_timings(dsi); > > - if (dsi->mode == OMAP_DSS_DSI_VIDEO_MODE) { > - /* DDR_CLK_ALWAYS_ON */ > - REG_FLD_MOD(dsi, DSI_CLK_CTRL, > - dsi->vm_timings.ddr_clk_always_on, 13, 13); > - } > + /* DDR_CLK_ALWAYS_ON */ > + REG_FLD_MOD(dsi, DSI_CLK_CTRL, > + !(dsi->dsidev->mode_flags & MIPI_DSI_CLOCK_NON_CONTINUOUS), > + 13, 13); > > dsi->ulps_enabled = false; > > @@ -3646,7 +3645,7 @@ static void dsi_setup_dsi_vcs(struct dsi_data *dsi) > dsi_force_tx_stop_mode_io(dsi); > > /* start the DDR clock by sending a NULL packet */ > - if (dsi->vm_timings.ddr_clk_always_on) > + if (!(dsi->dsidev->mode_flags & MIPI_DSI_CLOCK_NON_CONTINUOUS)) > dsi_vc_send_null(dsi, VC_CMD, dsi->dsidev->channel); > } > > @@ -4155,7 +4154,6 @@ static bool dsi_vm_calc_blanking(struct dsi_clk_calc_ctx *ctx) > dsi_vm->hfp_blanking_mode = 1; > dsi_vm->hbp_blanking_mode = 1; > > - dsi_vm->ddr_clk_always_on = cfg->ddr_clk_always_on; > dsi_vm->window_sync = 4; > > /* setup DISPC videomode */ > diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.h b/drivers/gpu/drm/omapdrm/dss/dsi.h > index 478fc10bd18d..476069fda082 100644 > --- a/drivers/gpu/drm/omapdrm/dss/dsi.h > +++ b/drivers/gpu/drm/omapdrm/dss/dsi.h > @@ -212,7 +212,6 @@ struct omap_dss_dsi_videomode_timings { > > enum omap_dss_dsi_trans_mode trans_mode; > > - bool ddr_clk_always_on; > int window_sync; > }; > > @@ -224,7 +223,6 @@ struct omap_dss_dsi_config { > unsigned long hs_clk_min, hs_clk_max; > unsigned long lp_clk_min, lp_clk_max; > > - bool ddr_clk_always_on; > enum omap_dss_dsi_trans_mode trans_mode; > }; > > -- > 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 71de6119d2de..cc8b169b2223 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -1734,11 +1734,10 @@ static int dsi_cio_init(struct dsi_data *dsi) dsi_cio_timings(dsi); - if (dsi->mode == OMAP_DSS_DSI_VIDEO_MODE) { - /* DDR_CLK_ALWAYS_ON */ - REG_FLD_MOD(dsi, DSI_CLK_CTRL, - dsi->vm_timings.ddr_clk_always_on, 13, 13); - } + /* DDR_CLK_ALWAYS_ON */ + REG_FLD_MOD(dsi, DSI_CLK_CTRL, + !(dsi->dsidev->mode_flags & MIPI_DSI_CLOCK_NON_CONTINUOUS), + 13, 13); dsi->ulps_enabled = false; @@ -3646,7 +3645,7 @@ static void dsi_setup_dsi_vcs(struct dsi_data *dsi) dsi_force_tx_stop_mode_io(dsi); /* start the DDR clock by sending a NULL packet */ - if (dsi->vm_timings.ddr_clk_always_on) + if (!(dsi->dsidev->mode_flags & MIPI_DSI_CLOCK_NON_CONTINUOUS)) dsi_vc_send_null(dsi, VC_CMD, dsi->dsidev->channel); } @@ -4155,7 +4154,6 @@ static bool dsi_vm_calc_blanking(struct dsi_clk_calc_ctx *ctx) dsi_vm->hfp_blanking_mode = 1; dsi_vm->hbp_blanking_mode = 1; - dsi_vm->ddr_clk_always_on = cfg->ddr_clk_always_on; dsi_vm->window_sync = 4; /* setup DISPC videomode */ diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.h b/drivers/gpu/drm/omapdrm/dss/dsi.h index 478fc10bd18d..476069fda082 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.h +++ b/drivers/gpu/drm/omapdrm/dss/dsi.h @@ -212,7 +212,6 @@ struct omap_dss_dsi_videomode_timings { enum omap_dss_dsi_trans_mode trans_mode; - bool ddr_clk_always_on; int window_sync; }; @@ -224,7 +223,6 @@ struct omap_dss_dsi_config { unsigned long hs_clk_min, hs_clk_max; unsigned long lp_clk_min, lp_clk_max; - bool ddr_clk_always_on; enum omap_dss_dsi_trans_mode trans_mode; };