Message ID | 20201208122855.254819-16-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:41PM +0200, Tomi Valkeinen wrote: > For command mode panels we can use a single VC for sending command and > video data, even if we have to change the data source for that VC when > going from command to video or vice versa. > > However, with video mode panels we want to keep the pixel data VC > enabled, and use another VC for command data, and the commands will get > interleaved into the pixel data. > > This patch makes the driver use VC0 for commands and VC1 for video. > > 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 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c > index 9d210a020916..0795efdd8902 100644 > --- a/drivers/gpu/drm/omapdrm/dss/dsi.c > +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c > @@ -452,7 +452,9 @@ static bool dsi_perf; > module_param(dsi_perf, bool, 0644); > #endif > > -#define VC_DEFAULT 0 > +/* Note: for some reason video mode seems to work only if VC_VIDEO is 0 */ > +#define VC_VIDEO 0 > +#define VC_CMD 1 > > #define drm_bridge_to_dsi(bridge) \ > container_of(bridge, struct dsi_data, bridge) > @@ -3723,7 +3725,7 @@ static void dsi_disable_video_outputs(struct omap_dss_device *dssdev) > dsi_bus_lock(dsi); > dsi->video_enabled = false; > > - dsi_disable_video_output(dssdev, VC_DEFAULT); > + dsi_disable_video_output(dssdev, VC_VIDEO); > > dsi_display_disable(dssdev); > > @@ -3951,7 +3953,7 @@ static int dsi_update_channel(struct omap_dss_device *dssdev, int vc) > > static int dsi_update_all(struct omap_dss_device *dssdev) > { > - return dsi_update_channel(dssdev, VC_DEFAULT); > + return dsi_update_channel(dssdev, VC_VIDEO); > } > > /* Display funcs */ > @@ -4184,7 +4186,7 @@ static void dsi_enable_video_outputs(struct omap_dss_device *dssdev) > > dsi_display_enable(dssdev); > > - dsi_enable_video_output(dssdev, VC_DEFAULT); > + dsi_enable_video_output(dssdev, VC_VIDEO); > > dsi->video_enabled = true; > > @@ -4941,7 +4943,7 @@ static ssize_t omap_dsi_host_transfer(struct mipi_dsi_host *host, > { > struct dsi_data *dsi = host_to_omap(host); > int r; > - int vc = VC_DEFAULT; > + int vc = VC_CMD; > > dsi_bus_lock(dsi); > > -- > 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 9d210a020916..0795efdd8902 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -452,7 +452,9 @@ static bool dsi_perf; module_param(dsi_perf, bool, 0644); #endif -#define VC_DEFAULT 0 +/* Note: for some reason video mode seems to work only if VC_VIDEO is 0 */ +#define VC_VIDEO 0 +#define VC_CMD 1 #define drm_bridge_to_dsi(bridge) \ container_of(bridge, struct dsi_data, bridge) @@ -3723,7 +3725,7 @@ static void dsi_disable_video_outputs(struct omap_dss_device *dssdev) dsi_bus_lock(dsi); dsi->video_enabled = false; - dsi_disable_video_output(dssdev, VC_DEFAULT); + dsi_disable_video_output(dssdev, VC_VIDEO); dsi_display_disable(dssdev); @@ -3951,7 +3953,7 @@ static int dsi_update_channel(struct omap_dss_device *dssdev, int vc) static int dsi_update_all(struct omap_dss_device *dssdev) { - return dsi_update_channel(dssdev, VC_DEFAULT); + return dsi_update_channel(dssdev, VC_VIDEO); } /* Display funcs */ @@ -4184,7 +4186,7 @@ static void dsi_enable_video_outputs(struct omap_dss_device *dssdev) dsi_display_enable(dssdev); - dsi_enable_video_output(dssdev, VC_DEFAULT); + dsi_enable_video_output(dssdev, VC_VIDEO); dsi->video_enabled = true; @@ -4941,7 +4943,7 @@ static ssize_t omap_dsi_host_transfer(struct mipi_dsi_host *host, { struct dsi_data *dsi = host_to_omap(host); int r; - int vc = VC_DEFAULT; + int vc = VC_CMD; dsi_bus_lock(dsi);