From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Sebastian Reichel <sre@kernel.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Nikhil Devshatwar <nikhil.nd@ti.com>,
<dri-devel@lists.freedesktop.org>
Cc: <linux-omap@vger.kernel.org>, Sekhar Nori <nsekhar@ti.com>,
Tony Lindgren <tony@atomide.com>, <hns@goldelico.com>,
Sam Ravnborg <sam@ravnborg.org>,
Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: [PATCH v5 07/29] drm/omap: dsi: simplify VC handling
Date: Tue, 8 Dec 2020 14:28:33 +0200 [thread overview]
Message-ID: <20201208122855.254819-8-tomi.valkeinen@ti.com> (raw)
In-Reply-To: <20201208122855.254819-1-tomi.valkeinen@ti.com>
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>
---
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
next prev parent reply other threads:[~2020-12-08 12:31 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-08 12:28 [PATCH v5 00/29] Convert DSI code to use drm_mipi_dsi and drm_panel (second half) Tomi Valkeinen
2020-12-08 12:28 ` [PATCH v5 01/29] drm/panel: panel-dsi-cm: cleanup tear enable Tomi Valkeinen
2020-12-14 13:09 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 02/29] ARM: dts: omap5: add address-cells & size-cells to dsi Tomi Valkeinen
2020-12-14 13:09 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 03/29] drm/omap: pll: fix iteration loop check Tomi Valkeinen
2020-12-14 13:10 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 04/29] drm/omap: dsi: set trans_mode according to client mode_flags Tomi Valkeinen
2020-12-14 13:10 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 05/29] drm/panel: panel-dsi-cm: set column & page at setup Tomi Valkeinen
2020-12-14 13:10 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 06/29] drm/omap: dsi: send nop instead of page & column Tomi Valkeinen
2020-12-14 14:22 ` Sebastian Reichel
2020-12-08 12:28 ` Tomi Valkeinen [this message]
2020-12-14 14:31 ` [PATCH v5 07/29] drm/omap: dsi: simplify VC handling Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 08/29] drm/omap: dsi: drop useless channel checks Tomi Valkeinen
2020-12-14 14:32 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 09/29] drm/omap: dsi: cleanup dispc channel usage Tomi Valkeinen
2020-12-08 15:17 ` Laurent Pinchart
2020-12-14 14:35 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 10/29] drm/omap: dsi: rename 'channel' to 'vc' Tomi Valkeinen
2020-12-08 15:22 ` Laurent Pinchart
2020-12-14 15:18 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 11/29] drm/omap: dsi: pass vc to various functions Tomi Valkeinen
2020-12-08 15:38 ` Laurent Pinchart
2020-12-08 15:45 ` Tomi Valkeinen
2020-12-14 15:37 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 12/29] drm/omap: dsi: untangle vc & channel Tomi Valkeinen
2020-12-08 15:41 ` Laurent Pinchart
2020-12-14 15:47 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 13/29] drm/omap: dsi: skip dsi_vc_enable_hs when already in correct mode Tomi Valkeinen
2020-12-14 15:50 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 14/29] drm/omap: dsi: enable HS before sending the frame Tomi Valkeinen
2020-12-08 15:42 ` Laurent Pinchart
2020-12-14 15:51 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 15/29] drm/omap: dsi: use separate VCs for cmd and video Tomi Valkeinen
2020-12-14 15:54 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 16/29] drm/panel: panel-dsi-cm: remove extra 'if' Tomi Valkeinen
2020-12-08 15:42 ` Laurent Pinchart
2020-12-14 15:55 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 17/29] drm/panel: panel-dsi-cm: add panel database to driver Tomi Valkeinen
2020-12-14 16:04 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 18/29] drm/panel: panel-dsi-cm: drop unneeded includes Tomi Valkeinen
2020-12-14 16:06 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 19/29] drm/omap: dsi: move structs & defines to dsi.h Tomi Valkeinen
2020-12-14 16:14 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 20/29] drm/omap: dsi: move enable/disable to bridge enable/disable Tomi Valkeinen
2020-12-14 16:16 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 21/29] drm/omap: dsi: display_enable cleanup Tomi Valkeinen
2020-12-14 16:17 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 22/29] drm/omap: dsi: display_disable cleanup Tomi Valkeinen
2020-12-14 16:20 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 23/29] drm/omap: dsi: rename dsi_display_* functions Tomi Valkeinen
2020-12-14 16:22 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 24/29] drm/omap: dsi: cleanup initial vc setup Tomi Valkeinen
2020-12-14 16:34 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 25/29] drm/omap: dsi: split video mode enable/disable into separate func Tomi Valkeinen
2020-12-14 16:38 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 26/29] drm/omap: dsi: fix and cleanup ddr_clk_always_on Tomi Valkeinen
2020-12-14 16:39 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 27/29] drm/omap: dsi: remove ulps support Tomi Valkeinen
2020-12-14 17:39 ` Sebastian Reichel
2020-12-14 18:55 ` Tomi Valkeinen
2020-12-14 22:08 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 28/29] drm/omap: dsi: fix DCS_CMD_ENABLE Tomi Valkeinen
2020-12-14 16:48 ` Sebastian Reichel
2020-12-08 12:28 ` [PATCH v5 29/29] drm/omap: dsi: allow DSI commands to be sent early Tomi Valkeinen
2020-12-08 15:48 ` Laurent Pinchart
2020-12-10 7:34 ` Tomi Valkeinen
2020-12-10 8:17 ` Tomi Valkeinen
2020-12-14 17:17 ` Sebastian Reichel
2020-12-15 10:05 ` Tomi Valkeinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201208122855.254819-8-tomi.valkeinen@ti.com \
--to=tomi.valkeinen@ti.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hns@goldelico.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-omap@vger.kernel.org \
--cc=nikhil.nd@ti.com \
--cc=nsekhar@ti.com \
--cc=sam@ravnborg.org \
--cc=sre@kernel.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).