From: Tomi Valkeinen <tomi.valkeinen@ti.com> To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org, devicetree@vger.kernel.org Cc: Archit Taneja <archit@ti.com>, Darren Etheridge <detheridge@ti.com>, Tony Lindgren <tony@atomide.com>, Tomi Valkeinen <tomi.valkeinen@ti.com> Subject: [PATCH 02/26] OMAPDSS: DSI: fix fifosize Date: Wed, 4 Dec 2013 14:28:29 +0200 [thread overview] Message-ID: <1386160133-24026-3-git-send-email-tomi.valkeinen@ti.com> (raw) In-Reply-To: <1386160133-24026-1-git-send-email-tomi.valkeinen@ti.com> DSI has separate TX and RX fifos. However, the current code only has one field where the fifo size is stored, and the code for both TX and RX config write to the same field. This has not caused issues, as we've been using the same fifo sizes. Fix this bug by creating separate fields for TX and RX fifo sizes. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- drivers/video/omap2/dss/dsi.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index 6056b27cf73c..1cd3e47fd43f 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -297,7 +297,8 @@ struct dsi_data { struct { enum dsi_vc_source source; struct omap_dss_device *dssdev; - enum fifo_size fifo_size; + enum fifo_size tx_fifo_size; + enum fifo_size rx_fifo_size; int vc_id; } vc[4]; @@ -2427,14 +2428,14 @@ static void dsi_config_tx_fifo(struct platform_device *dsidev, int add = 0; int i; - dsi->vc[0].fifo_size = size1; - dsi->vc[1].fifo_size = size2; - dsi->vc[2].fifo_size = size3; - dsi->vc[3].fifo_size = size4; + dsi->vc[0].tx_fifo_size = size1; + dsi->vc[1].tx_fifo_size = size2; + dsi->vc[2].tx_fifo_size = size3; + dsi->vc[3].tx_fifo_size = size4; for (i = 0; i < 4; i++) { u8 v; - int size = dsi->vc[i].fifo_size; + int size = dsi->vc[i].tx_fifo_size; if (add + size > 4) { DSSERR("Illegal FIFO configuration\n"); @@ -2460,14 +2461,14 @@ static void dsi_config_rx_fifo(struct platform_device *dsidev, int add = 0; int i; - dsi->vc[0].fifo_size = size1; - dsi->vc[1].fifo_size = size2; - dsi->vc[2].fifo_size = size3; - dsi->vc[3].fifo_size = size4; + dsi->vc[0].rx_fifo_size = size1; + dsi->vc[1].rx_fifo_size = size2; + dsi->vc[2].rx_fifo_size = size3; + dsi->vc[3].rx_fifo_size = size4; for (i = 0; i < 4; i++) { u8 v; - int size = dsi->vc[i].fifo_size; + int size = dsi->vc[i].rx_fifo_size; if (add + size > 4) { DSSERR("Illegal FIFO configuration\n"); @@ -2920,7 +2921,7 @@ static int dsi_vc_send_long(struct platform_device *dsidev, int channel, DSSDBG("dsi_vc_send_long, %d bytes\n", len); /* len + header */ - if (dsi->vc[channel].fifo_size * 32 * 4 < len + 4) { + if (dsi->vc[channel].tx_fifo_size * 32 * 4 < len + 4) { DSSERR("unable to send long packet: packet too long.\n"); return -EINVAL; } -- 1.8.3.2
WARNING: multiple messages have this Message-ID (diff)
From: Tomi Valkeinen <tomi.valkeinen@ti.com> To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org, devicetree@vger.kernel.org Cc: Archit Taneja <archit@ti.com>, Darren Etheridge <detheridge@ti.com>, Tony Lindgren <tony@atomide.com>, Tomi Valkeinen <tomi.valkeinen@ti.com> Subject: [PATCH 02/26] OMAPDSS: DSI: fix fifosize Date: Wed, 04 Dec 2013 12:28:29 +0000 [thread overview] Message-ID: <1386160133-24026-3-git-send-email-tomi.valkeinen@ti.com> (raw) In-Reply-To: <1386160133-24026-1-git-send-email-tomi.valkeinen@ti.com> DSI has separate TX and RX fifos. However, the current code only has one field where the fifo size is stored, and the code for both TX and RX config write to the same field. This has not caused issues, as we've been using the same fifo sizes. Fix this bug by creating separate fields for TX and RX fifo sizes. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- drivers/video/omap2/dss/dsi.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index 6056b27cf73c..1cd3e47fd43f 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -297,7 +297,8 @@ struct dsi_data { struct { enum dsi_vc_source source; struct omap_dss_device *dssdev; - enum fifo_size fifo_size; + enum fifo_size tx_fifo_size; + enum fifo_size rx_fifo_size; int vc_id; } vc[4]; @@ -2427,14 +2428,14 @@ static void dsi_config_tx_fifo(struct platform_device *dsidev, int add = 0; int i; - dsi->vc[0].fifo_size = size1; - dsi->vc[1].fifo_size = size2; - dsi->vc[2].fifo_size = size3; - dsi->vc[3].fifo_size = size4; + dsi->vc[0].tx_fifo_size = size1; + dsi->vc[1].tx_fifo_size = size2; + dsi->vc[2].tx_fifo_size = size3; + dsi->vc[3].tx_fifo_size = size4; for (i = 0; i < 4; i++) { u8 v; - int size = dsi->vc[i].fifo_size; + int size = dsi->vc[i].tx_fifo_size; if (add + size > 4) { DSSERR("Illegal FIFO configuration\n"); @@ -2460,14 +2461,14 @@ static void dsi_config_rx_fifo(struct platform_device *dsidev, int add = 0; int i; - dsi->vc[0].fifo_size = size1; - dsi->vc[1].fifo_size = size2; - dsi->vc[2].fifo_size = size3; - dsi->vc[3].fifo_size = size4; + dsi->vc[0].rx_fifo_size = size1; + dsi->vc[1].rx_fifo_size = size2; + dsi->vc[2].rx_fifo_size = size3; + dsi->vc[3].rx_fifo_size = size4; for (i = 0; i < 4; i++) { u8 v; - int size = dsi->vc[i].fifo_size; + int size = dsi->vc[i].rx_fifo_size; if (add + size > 4) { DSSERR("Illegal FIFO configuration\n"); @@ -2920,7 +2921,7 @@ static int dsi_vc_send_long(struct platform_device *dsidev, int channel, DSSDBG("dsi_vc_send_long, %d bytes\n", len); /* len + header */ - if (dsi->vc[channel].fifo_size * 32 * 4 < len + 4) { + if (dsi->vc[channel].tx_fifo_size * 32 * 4 < len + 4) { DSSERR("unable to send long packet: packet too long.\n"); return -EINVAL; } -- 1.8.3.2
next prev parent reply other threads:[~2013-12-04 12:28 UTC|newest] Thread overview: 183+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-12-04 12:28 [PATCH 00/26] OMAPDSS: DT support (Christmas edition) Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 01/26] OMAPDSS: rename display-sysfs 'name' entry Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen [this message] 2013-12-04 12:28 ` [PATCH 02/26] OMAPDSS: DSI: fix fifosize Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 03/26] ARM: OMAP: remove DSS DT hack Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 04/26] OMAPDSS: remove DT hacks for regulators Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 05/26] ARM: OMAP2+: add omapdss_init_of() Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-11 23:10 ` Laurent Pinchart 2013-12-11 23:10 ` Laurent Pinchart 2013-12-12 7:30 ` Tomi Valkeinen 2013-12-12 7:30 ` Tomi Valkeinen 2013-12-13 8:32 ` Archit Taneja 2013-12-13 8:44 ` Archit Taneja 2013-12-13 8:40 ` Tomi Valkeinen 2013-12-13 8:40 ` Tomi Valkeinen 2013-12-13 17:07 ` Tony Lindgren 2013-12-13 17:07 ` Tony Lindgren 2013-12-04 12:28 ` [PATCH 06/26] OMAPDSS: if dssdev->name==NULL, use alias Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-11 23:13 ` Laurent Pinchart 2013-12-11 23:13 ` Laurent Pinchart 2013-12-11 23:56 ` Laurent Pinchart 2013-12-11 23:56 ` Laurent Pinchart 2013-12-12 7:41 ` Tomi Valkeinen 2013-12-12 7:41 ` Tomi Valkeinen [not found] ` <52A968BD.20304-l0cyMroinI0@public.gmane.org> 2013-12-12 10:05 ` Sebastian Reichel 2013-12-12 10:05 ` Sebastian Reichel 2013-12-12 13:22 ` Laurent Pinchart 2013-12-12 13:22 ` Laurent Pinchart 2013-12-12 14:13 ` Tomi Valkeinen 2013-12-12 14:13 ` Tomi Valkeinen 2013-12-12 14:15 ` Laurent Pinchart 2013-12-12 14:15 ` Laurent Pinchart 2013-12-12 14:19 ` Tomi Valkeinen 2013-12-12 14:19 ` Tomi Valkeinen 2013-12-12 17:31 ` Sebastian Reichel 2013-12-12 17:31 ` Sebastian Reichel 2013-12-13 12:01 ` Tomi Valkeinen 2013-12-13 12:01 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 07/26] OMAPDSS: get dssdev->alias from DT alias Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 08/26] OMAPFB: clean up default display search Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 09/26] OMAPFB: search for default display with DT alias Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 10/26] OMAPDSS: add of helpers Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-11 23:19 ` Laurent Pinchart 2013-12-11 23:19 ` Laurent Pinchart 2013-12-12 7:48 ` Tomi Valkeinen 2013-12-12 7:48 ` Tomi Valkeinen 2013-12-13 2:37 ` Laurent Pinchart 2013-12-13 2:37 ` Laurent Pinchart 2013-12-04 12:28 ` [PATCH 11/26] OMAPDSS: Add DT support to DSS, DISPC, DPI, HDMI, VENC Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 12/26] OMAPDSS: Add DT support to DSI Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 13/26] ARM: omap3.dtsi: add omapdss information Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-05 17:05 ` Tony Lindgren 2013-12-05 17:05 ` Tony Lindgren 2013-12-09 12:45 ` Tomi Valkeinen 2013-12-09 12:45 ` Tomi Valkeinen 2013-12-09 18:04 ` Tony Lindgren 2013-12-09 18:04 ` Tony Lindgren 2013-12-11 23:44 ` Laurent Pinchart 2013-12-11 23:44 ` Laurent Pinchart 2013-12-12 8:38 ` Tomi Valkeinen 2013-12-12 8:38 ` Tomi Valkeinen 2013-12-12 21:59 ` Tony Lindgren 2013-12-13 3:27 ` Laurent Pinchart 2013-12-13 3:27 ` Laurent Pinchart 2013-12-13 10:18 ` Tomi Valkeinen 2013-12-13 10:18 ` Tomi Valkeinen [not found] ` <52AADEF3.9040808-l0cyMroinI0@public.gmane.org> 2013-12-13 17:10 ` Tony Lindgren 2013-12-13 17:10 ` Tony Lindgren 2013-12-13 3:24 ` Laurent Pinchart 2013-12-13 3:24 ` Laurent Pinchart 2013-12-13 9:29 ` Tomi Valkeinen 2013-12-13 9:29 ` Tomi Valkeinen 2013-12-16 10:49 ` Tomi Valkeinen 2013-12-16 10:49 ` Tomi Valkeinen [not found] ` <52AEDA9F.2020609-l0cyMroinI0@public.gmane.org> 2013-12-16 13:55 ` Laurent Pinchart 2013-12-16 13:55 ` Laurent Pinchart 2013-12-04 12:28 ` [PATCH 14/26] ARM: omap4.dtsi: " Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 15/26] ARM: omap4-panda.dts: add display information Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-06 8:57 ` Javier Martinez Canillas 2013-12-06 8:57 ` Javier Martinez Canillas 2013-12-09 12:56 ` Tomi Valkeinen 2013-12-09 12:56 ` Tomi Valkeinen 2013-12-09 15:09 ` Javier Martinez Canillas 2013-12-09 15:09 ` Javier Martinez Canillas 2013-12-09 15:30 ` Tomi Valkeinen 2013-12-09 15:30 ` Tomi Valkeinen 2013-12-09 16:53 ` Javier Martinez Canillas 2013-12-09 16:53 ` Javier Martinez Canillas 2013-12-10 10:56 ` Enric Balletbo Serra 2013-12-10 10:56 ` Enric Balletbo Serra 2013-12-10 12:10 ` Tomi Valkeinen 2013-12-10 12:10 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 16/26] ARM: omap4-sdp.dts: " Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-13 9:27 ` Archit Taneja 2013-12-13 9:39 ` Archit Taneja 2013-12-13 9:39 ` Tomi Valkeinen 2013-12-13 9:39 ` Tomi Valkeinen 2013-12-13 9:58 ` Archit Taneja 2013-12-13 9:58 ` Archit Taneja 2013-12-13 10:15 ` Tomi Valkeinen 2013-12-13 10:15 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 17/26] ARM: omap3-tobi.dts: add lcd (TEST) Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-06 10:18 ` Florian Vaussard 2013-12-06 10:18 ` Florian Vaussard 2013-12-10 12:18 ` Tomi Valkeinen 2013-12-10 12:18 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 18/26] ARM: omap3-beagle.dts: add display information Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-06 8:41 ` Javier Martinez Canillas 2013-12-06 8:41 ` Javier Martinez Canillas 2013-12-09 12:06 ` Tomi Valkeinen 2013-12-09 12:06 ` Tomi Valkeinen 2013-12-09 12:16 ` Javier Martinez Canillas 2013-12-09 12:16 ` Javier Martinez Canillas 2013-12-04 12:28 ` [PATCH 19/26] ARM: omap3-beagle-xm.dts: " Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 20/26] OMAPDSS: panel-dsi-cm: Add DT support Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 21/26] OMAPDSS: encoder-tfp410: " Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 22/26] OMAPDSS: connector-dvi: " Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 23/26] OMAPDSS: encoder-tpd12s015: " Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 24/26] OMAPDSS: hdmi-connector: " Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 25/26] OMAPDSS: panel-dpi: " Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen 2013-12-04 12:28 ` [PATCH 26/26] OMAPDSS: connector-analog-tv: " Tomi Valkeinen 2013-12-04 12:28 ` Tomi Valkeinen [not found] ` <1386160133-24026-1-git-send-email-tomi.valkeinen-l0cyMroinI0@public.gmane.org> 2013-12-04 16:01 ` [PATCH 00/26] OMAPDSS: DT support (Christmas edition) Sebastian Reichel 2013-12-04 16:01 ` Sebastian Reichel 2013-12-05 9:41 ` Tomi Valkeinen 2013-12-05 9:41 ` Tomi Valkeinen 2013-12-12 0:39 ` Laurent Pinchart 2013-12-12 0:39 ` Laurent Pinchart 2013-12-12 8:54 ` Tomi Valkeinen 2013-12-12 8:54 ` Tomi Valkeinen 2013-12-13 3:45 ` Laurent Pinchart 2013-12-13 3:45 ` Laurent Pinchart 2013-12-13 8:16 ` Geert Uytterhoeven 2013-12-13 8:16 ` Geert Uytterhoeven 2013-12-13 10:05 ` Tomi Valkeinen 2013-12-13 10:05 ` Tomi Valkeinen 2013-12-13 14:37 ` Laurent Pinchart 2013-12-13 14:37 ` Laurent Pinchart 2013-12-13 15:47 ` Tomi Valkeinen 2013-12-13 15:47 ` Tomi Valkeinen 2013-12-13 17:22 ` Tony Lindgren 2013-12-13 17:22 ` Tony Lindgren 2013-12-14 7:34 ` Tomi Valkeinen 2013-12-14 7:34 ` Tomi Valkeinen 2013-12-14 14:09 ` Tony Lindgren 2013-12-14 14:09 ` Tony Lindgren 2013-12-16 7:24 ` Tomi Valkeinen 2013-12-16 7:24 ` Tomi Valkeinen 2013-12-18 0:30 ` Tony Lindgren 2013-12-18 0:30 ` Tony Lindgren 2013-12-07 3:48 Javier Martinez Canillas 2013-12-07 3:48 ` Javier Martinez Canillas 2013-12-07 4:28 ` Javier Martinez Canillas 2013-12-07 4:28 ` Javier Martinez Canillas 2013-12-09 12:01 ` Tomi Valkeinen 2013-12-09 12:01 ` Tomi Valkeinen 2013-12-09 12:23 ` Javier Martinez Canillas 2013-12-09 12:23 ` Javier Martinez Canillas
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=1386160133-24026-3-git-send-email-tomi.valkeinen@ti.com \ --to=tomi.valkeinen@ti.com \ --cc=archit@ti.com \ --cc=detheridge@ti.com \ --cc=devicetree@vger.kernel.org \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-omap@vger.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.