Commit 9a521118 authored by Tomi Valkeinen's avatar Tomi Valkeinen

drm/omap: dsi: fix and cleanup ddr_clk_always_on

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: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201215104657.802264-82-tomi.valkeinen@ti.com
parent b6c1048c
...@@ -1736,11 +1736,10 @@ static int dsi_cio_init(struct dsi_data *dsi) ...@@ -1736,11 +1736,10 @@ static int dsi_cio_init(struct dsi_data *dsi)
dsi_cio_timings(dsi); dsi_cio_timings(dsi);
if (dsi->mode == OMAP_DSS_DSI_VIDEO_MODE) {
/* DDR_CLK_ALWAYS_ON */ /* DDR_CLK_ALWAYS_ON */
REG_FLD_MOD(dsi, DSI_CLK_CTRL, REG_FLD_MOD(dsi, DSI_CLK_CTRL,
dsi->vm_timings.ddr_clk_always_on, 13, 13); !(dsi->dsidev->mode_flags & MIPI_DSI_CLOCK_NON_CONTINUOUS),
} 13, 13);
dsi->ulps_enabled = false; dsi->ulps_enabled = false;
...@@ -3643,7 +3642,7 @@ static void dsi_setup_dsi_vcs(struct dsi_data *dsi) ...@@ -3643,7 +3642,7 @@ static void dsi_setup_dsi_vcs(struct dsi_data *dsi)
dsi_force_tx_stop_mode_io(dsi); dsi_force_tx_stop_mode_io(dsi);
/* start the DDR clock by sending a NULL packet */ /* 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); dsi_vc_send_null(dsi, VC_CMD, dsi->dsidev->channel);
} }
...@@ -4152,7 +4151,6 @@ static bool dsi_vm_calc_blanking(struct dsi_clk_calc_ctx *ctx) ...@@ -4152,7 +4151,6 @@ static bool dsi_vm_calc_blanking(struct dsi_clk_calc_ctx *ctx)
dsi_vm->hfp_blanking_mode = 1; dsi_vm->hfp_blanking_mode = 1;
dsi_vm->hbp_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; dsi_vm->window_sync = 4;
/* setup DISPC videomode */ /* setup DISPC videomode */
......
...@@ -212,7 +212,6 @@ struct omap_dss_dsi_videomode_timings { ...@@ -212,7 +212,6 @@ struct omap_dss_dsi_videomode_timings {
enum omap_dss_dsi_trans_mode trans_mode; enum omap_dss_dsi_trans_mode trans_mode;
bool ddr_clk_always_on;
int window_sync; int window_sync;
}; };
...@@ -224,7 +223,6 @@ struct omap_dss_dsi_config { ...@@ -224,7 +223,6 @@ struct omap_dss_dsi_config {
unsigned long hs_clk_min, hs_clk_max; unsigned long hs_clk_min, hs_clk_max;
unsigned long lp_clk_min, lp_clk_max; unsigned long lp_clk_min, lp_clk_max;
bool ddr_clk_always_on;
enum omap_dss_dsi_trans_mode trans_mode; enum omap_dss_dsi_trans_mode trans_mode;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment