| Message ID | 20201208122855.254819-10-tomi.valkeinen@ti.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v5,01/29] drm/panel: panel-dsi-cm: cleanup tear enable | expand |
Hi, On Tue, Dec 08, 2020 at 02:28:35PM +0200, Tomi Valkeinen wrote: > The "channel" usage in omap dsi driver is confusing. As the first step, > change "channel" to "dispc_channel" when dealing with the dispc channel. > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > --- Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> -- Sebastian > drivers/gpu/drm/omapdrm/dss/dsi.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c > index c78ae99c8742..cf0dc4872d14 100644 > --- a/drivers/gpu/drm/omapdrm/dss/dsi.c > +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c > @@ -3978,10 +3978,10 @@ static int dsi_configure_dispc_clocks(struct dsi_data *dsi) > > static int dsi_display_init_dispc(struct dsi_data *dsi) > { > - enum omap_channel channel = dsi->output.dispc_channel; > + enum omap_channel dispc_channel = dsi->output.dispc_channel; > int r; > > - dss_select_lcd_clk_source(dsi->dss, channel, dsi->module_id == 0 ? > + dss_select_lcd_clk_source(dsi->dss, dispc_channel, dsi->module_id == 0 ? > DSS_CLK_SRC_PLL1_1 : > DSS_CLK_SRC_PLL2_1); > > @@ -4017,19 +4017,19 @@ static int dsi_display_init_dispc(struct dsi_data *dsi) > dss_mgr_unregister_framedone_handler(&dsi->output, > dsi_framedone_irq_callback, dsi); > err: > - dss_select_lcd_clk_source(dsi->dss, channel, DSS_CLK_SRC_FCK); > + dss_select_lcd_clk_source(dsi->dss, dispc_channel, DSS_CLK_SRC_FCK); > return r; > } > > static void dsi_display_uninit_dispc(struct dsi_data *dsi) > { > - enum omap_channel channel = dsi->output.dispc_channel; > + enum omap_channel dispc_channel = dsi->output.dispc_channel; > > if (dsi->mode == OMAP_DSS_DSI_CMD_MODE) > dss_mgr_unregister_framedone_handler(&dsi->output, > dsi_framedone_irq_callback, dsi); > > - dss_select_lcd_clk_source(dsi->dss, channel, DSS_CLK_SRC_FCK); > + dss_select_lcd_clk_source(dsi->dss, dispc_channel, DSS_CLK_SRC_FCK); > } > > static int dsi_configure_dsi_clocks(struct dsi_data *dsi) > @@ -4846,12 +4846,12 @@ static int dsi_set_config(struct omap_dss_device *dssdev, > } > > /* > - * Return a hardcoded channel for the DSI output. This should work for > + * Return a hardcoded dispc channel for the DSI output. This should work for > * current use cases, but this can be later expanded to either resolve > * the channel in some more dynamic manner, or get the channel as a user > * parameter. > */ > -static enum omap_channel dsi_get_channel(struct dsi_data *dsi) > +static enum omap_channel dsi_get_dispc_channel(struct dsi_data *dsi) > { > switch (dsi->data->model) { > case DSI_MODEL_OMAP3: > @@ -5403,7 +5403,7 @@ static int dsi_init_output(struct dsi_data *dsi) > > out->type = OMAP_DISPLAY_TYPE_DSI; > out->name = dsi->module_id == 0 ? "dsi.0" : "dsi.1"; > - out->dispc_channel = dsi_get_channel(dsi); > + out->dispc_channel = dsi_get_dispc_channel(dsi); > out->dsi_ops = &dsi_ops; > out->of_port = 0; > out->bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE > -- > 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 c78ae99c8742..cf0dc4872d14 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -3978,10 +3978,10 @@ static int dsi_configure_dispc_clocks(struct dsi_data *dsi) static int dsi_display_init_dispc(struct dsi_data *dsi) { - enum omap_channel channel = dsi->output.dispc_channel; + enum omap_channel dispc_channel = dsi->output.dispc_channel; int r; - dss_select_lcd_clk_source(dsi->dss, channel, dsi->module_id == 0 ? + dss_select_lcd_clk_source(dsi->dss, dispc_channel, dsi->module_id == 0 ? DSS_CLK_SRC_PLL1_1 : DSS_CLK_SRC_PLL2_1); @@ -4017,19 +4017,19 @@ static int dsi_display_init_dispc(struct dsi_data *dsi) dss_mgr_unregister_framedone_handler(&dsi->output, dsi_framedone_irq_callback, dsi); err: - dss_select_lcd_clk_source(dsi->dss, channel, DSS_CLK_SRC_FCK); + dss_select_lcd_clk_source(dsi->dss, dispc_channel, DSS_CLK_SRC_FCK); return r; } static void dsi_display_uninit_dispc(struct dsi_data *dsi) { - enum omap_channel channel = dsi->output.dispc_channel; + enum omap_channel dispc_channel = dsi->output.dispc_channel; if (dsi->mode == OMAP_DSS_DSI_CMD_MODE) dss_mgr_unregister_framedone_handler(&dsi->output, dsi_framedone_irq_callback, dsi); - dss_select_lcd_clk_source(dsi->dss, channel, DSS_CLK_SRC_FCK); + dss_select_lcd_clk_source(dsi->dss, dispc_channel, DSS_CLK_SRC_FCK); } static int dsi_configure_dsi_clocks(struct dsi_data *dsi) @@ -4846,12 +4846,12 @@ static int dsi_set_config(struct omap_dss_device *dssdev, } /* - * Return a hardcoded channel for the DSI output. This should work for + * Return a hardcoded dispc channel for the DSI output. This should work for * current use cases, but this can be later expanded to either resolve * the channel in some more dynamic manner, or get the channel as a user * parameter. */ -static enum omap_channel dsi_get_channel(struct dsi_data *dsi) +static enum omap_channel dsi_get_dispc_channel(struct dsi_data *dsi) { switch (dsi->data->model) { case DSI_MODEL_OMAP3: @@ -5403,7 +5403,7 @@ static int dsi_init_output(struct dsi_data *dsi) out->type = OMAP_DISPLAY_TYPE_DSI; out->name = dsi->module_id == 0 ? "dsi.0" : "dsi.1"; - out->dispc_channel = dsi_get_channel(dsi); + out->dispc_channel = dsi_get_dispc_channel(dsi); out->dsi_ops = &dsi_ops; out->of_port = 0; out->bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE
The "channel" usage in omap dsi driver is confusing. As the first step, change "channel" to "dispc_channel" when dealing with the dispc channel. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- drivers/gpu/drm/omapdrm/dss/dsi.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)