From: Jagan Teki <jagan@amarulasolutions.com> To: Maxime Ripard <maxime.ripard@bootlin.com>, David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Chen-Yu Tsai <wens@csie.org> Cc: dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-amarula@amarulasolutions.com, Michael Trimarchi <michael@amarulasolutions.com>, linux-sunxi@googlegroups.com, Jagan Teki <jagan@amarulasolutions.com> Subject: [PATCH v9 5/5] drm/sun4i: sun6i_mipi_dsi: Simplify dsi setup timings code Date: Sun, 3 Mar 2019 23:05:27 +0530 [thread overview] Message-ID: <20190303173527.31055-6-jagan@amarulasolutions.com> (raw) In-Reply-To: <20190303173527.31055-1-jagan@amarulasolutions.com> DSI timings are varies between burst/non-burst devices and current driver is handling this support via if, else statements which would difficult to read. Simplify it by using goto to make code more readable. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Tested-by: Merlijn Wajer <merlijn@wizzup.org> --- Note: This change is created based on previous version burst changes [1] by addressing comment from [2] by Maxime to make code readable. [1] https://patchwork.kernel.org/cover/10813623/ [2] https://patchwork.kernel.org/patch/10666607/ drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 79 ++++++++++++++------------ 1 file changed, 42 insertions(+), 37 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c index 31ec4048804d..898f32319c2d 100644 --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c @@ -550,7 +550,8 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi, { struct mipi_dsi_device *device = dsi->device; unsigned int Bpp = mipi_dsi_pixel_format_to_bpp(device->format) / 8; - u16 hbp = 0, hfp = 0, hsa = 0, hblk = 0, vblk = 0; + u16 hbp, hfp, hsa, hblk; + u16 vblk = 0; u32 basic_ctl = 0; size_t bytes; u8 *buffer; @@ -558,6 +559,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi, /* Do all timing calculations up front to allocate buffer space */ if (device->mode_flags & MIPI_DSI_MODE_VIDEO_BURST) { + hbp = hfp = hsa = 0; hblk = mode->hdisplay * Bpp; basic_ctl = SUN6I_DSI_BASIC_CTL_VIDEO_BURST | SUN6I_DSI_BASIC_CTL_HSA_HSE_DIS | @@ -566,48 +568,51 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi, if (device->lanes == 4) basic_ctl |= SUN6I_DSI_BASIC_CTL_TRAIL_FILL | SUN6I_DSI_BASIC_CTL_TRAIL_INV(0xc); - } else { - /* - * A sync period is composed of a blanking packet (4 - * bytes + payload + 2 bytes) and a sync event packet - * (4 bytes). Its minimal size is therefore 10 bytes - */ + + goto alloc_buf; + } + + /* + * A sync period is composed of a blanking packet (4 + * bytes + payload + 2 bytes) and a sync event packet + * (4 bytes). Its minimal size is therefore 10 bytes + */ #define HSA_PACKET_OVERHEAD 10 - hsa = max((unsigned int)HSA_PACKET_OVERHEAD, - (mode->hsync_end - mode->hsync_start) * Bpp - HSA_PACKET_OVERHEAD); - - /* - * The backporch is set using a blanking packet (4 - * bytes + payload + 2 bytes). Its minimal size is - * therefore 6 bytes - */ + hsa = max((unsigned int)HSA_PACKET_OVERHEAD, + (mode->hsync_end - mode->hsync_start) * Bpp - HSA_PACKET_OVERHEAD); + + /* + * The backporch is set using a blanking packet (4 + * bytes + payload + 2 bytes). Its minimal size is + * therefore 6 bytes + */ #define HBP_PACKET_OVERHEAD 6 - hbp = max((unsigned int)HBP_PACKET_OVERHEAD, - (mode->htotal - mode->hsync_end) * Bpp - HBP_PACKET_OVERHEAD); - - /* - * The frontporch is set using a blanking packet (4 - * bytes + payload + 2 bytes). Its minimal size is - * therefore 6 bytes - */ + hbp = max((unsigned int)HBP_PACKET_OVERHEAD, + (mode->htotal - mode->hsync_end) * Bpp - HBP_PACKET_OVERHEAD); + + /* + * The frontporch is set using a blanking packet (4 + * bytes + payload + 2 bytes). Its minimal size is + * therefore 6 bytes + */ #define HFP_PACKET_OVERHEAD 6 - hfp = max((unsigned int)HFP_PACKET_OVERHEAD, - (mode->hsync_start - mode->hdisplay) * Bpp - HFP_PACKET_OVERHEAD); - - /* - * The blanking is set using a sync event (4 bytes) - * and a blanking packet (4 bytes + payload + 2 - * bytes). Its minimal size is therefore 10 bytes. - */ + hfp = max((unsigned int)HFP_PACKET_OVERHEAD, + (mode->hsync_start - mode->hdisplay) * Bpp - HFP_PACKET_OVERHEAD); + + /* + * The blanking is set using a sync event (4 bytes) + * and a blanking packet (4 bytes + payload + 2 + * bytes). Its minimal size is therefore 10 bytes. + */ #define HBLK_PACKET_OVERHEAD 10 - hblk = max((unsigned int)HBLK_PACKET_OVERHEAD, - (mode->htotal - (mode->hsync_end - mode->hsync_start)) * Bpp - - HBLK_PACKET_OVERHEAD); + hblk = max((unsigned int)HBLK_PACKET_OVERHEAD, + (mode->htotal - (mode->hsync_end - mode->hsync_start)) * Bpp - + HBLK_PACKET_OVERHEAD); - if (device->lanes == 4) - vblk = sun6i_dsi_get_timings_vblk(dsi, mode, hblk); - } + if (device->lanes == 4) + vblk = sun6i_dsi_get_timings_vblk(dsi, mode, hblk); +alloc_buf: /* How many bytes do we need to send all payloads? */ bytes = max_t(size_t, max(max(hfp, hblk), max(hsa, hbp)), vblk); buffer = kmalloc(bytes, GFP_KERNEL); -- 2.18.0.321.gffc6fa0e3
WARNING: multiple messages have this Message-ID (diff)
From: Jagan Teki <jagan@amarulasolutions.com> To: Maxime Ripard <maxime.ripard@bootlin.com>, David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Chen-Yu Tsai <wens@csie.org> Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sunxi@googlegroups.com, Jagan Teki <jagan@amarulasolutions.com>, Michael Trimarchi <michael@amarulasolutions.com>, linux-amarula@amarulasolutions.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v9 5/5] drm/sun4i: sun6i_mipi_dsi: Simplify dsi setup timings code Date: Sun, 3 Mar 2019 23:05:27 +0530 [thread overview] Message-ID: <20190303173527.31055-6-jagan@amarulasolutions.com> (raw) In-Reply-To: <20190303173527.31055-1-jagan@amarulasolutions.com> DSI timings are varies between burst/non-burst devices and current driver is handling this support via if, else statements which would difficult to read. Simplify it by using goto to make code more readable. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Tested-by: Merlijn Wajer <merlijn@wizzup.org> --- Note: This change is created based on previous version burst changes [1] by addressing comment from [2] by Maxime to make code readable. [1] https://patchwork.kernel.org/cover/10813623/ [2] https://patchwork.kernel.org/patch/10666607/ drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 79 ++++++++++++++------------ 1 file changed, 42 insertions(+), 37 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c index 31ec4048804d..898f32319c2d 100644 --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c @@ -550,7 +550,8 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi, { struct mipi_dsi_device *device = dsi->device; unsigned int Bpp = mipi_dsi_pixel_format_to_bpp(device->format) / 8; - u16 hbp = 0, hfp = 0, hsa = 0, hblk = 0, vblk = 0; + u16 hbp, hfp, hsa, hblk; + u16 vblk = 0; u32 basic_ctl = 0; size_t bytes; u8 *buffer; @@ -558,6 +559,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi, /* Do all timing calculations up front to allocate buffer space */ if (device->mode_flags & MIPI_DSI_MODE_VIDEO_BURST) { + hbp = hfp = hsa = 0; hblk = mode->hdisplay * Bpp; basic_ctl = SUN6I_DSI_BASIC_CTL_VIDEO_BURST | SUN6I_DSI_BASIC_CTL_HSA_HSE_DIS | @@ -566,48 +568,51 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi, if (device->lanes == 4) basic_ctl |= SUN6I_DSI_BASIC_CTL_TRAIL_FILL | SUN6I_DSI_BASIC_CTL_TRAIL_INV(0xc); - } else { - /* - * A sync period is composed of a blanking packet (4 - * bytes + payload + 2 bytes) and a sync event packet - * (4 bytes). Its minimal size is therefore 10 bytes - */ + + goto alloc_buf; + } + + /* + * A sync period is composed of a blanking packet (4 + * bytes + payload + 2 bytes) and a sync event packet + * (4 bytes). Its minimal size is therefore 10 bytes + */ #define HSA_PACKET_OVERHEAD 10 - hsa = max((unsigned int)HSA_PACKET_OVERHEAD, - (mode->hsync_end - mode->hsync_start) * Bpp - HSA_PACKET_OVERHEAD); - - /* - * The backporch is set using a blanking packet (4 - * bytes + payload + 2 bytes). Its minimal size is - * therefore 6 bytes - */ + hsa = max((unsigned int)HSA_PACKET_OVERHEAD, + (mode->hsync_end - mode->hsync_start) * Bpp - HSA_PACKET_OVERHEAD); + + /* + * The backporch is set using a blanking packet (4 + * bytes + payload + 2 bytes). Its minimal size is + * therefore 6 bytes + */ #define HBP_PACKET_OVERHEAD 6 - hbp = max((unsigned int)HBP_PACKET_OVERHEAD, - (mode->htotal - mode->hsync_end) * Bpp - HBP_PACKET_OVERHEAD); - - /* - * The frontporch is set using a blanking packet (4 - * bytes + payload + 2 bytes). Its minimal size is - * therefore 6 bytes - */ + hbp = max((unsigned int)HBP_PACKET_OVERHEAD, + (mode->htotal - mode->hsync_end) * Bpp - HBP_PACKET_OVERHEAD); + + /* + * The frontporch is set using a blanking packet (4 + * bytes + payload + 2 bytes). Its minimal size is + * therefore 6 bytes + */ #define HFP_PACKET_OVERHEAD 6 - hfp = max((unsigned int)HFP_PACKET_OVERHEAD, - (mode->hsync_start - mode->hdisplay) * Bpp - HFP_PACKET_OVERHEAD); - - /* - * The blanking is set using a sync event (4 bytes) - * and a blanking packet (4 bytes + payload + 2 - * bytes). Its minimal size is therefore 10 bytes. - */ + hfp = max((unsigned int)HFP_PACKET_OVERHEAD, + (mode->hsync_start - mode->hdisplay) * Bpp - HFP_PACKET_OVERHEAD); + + /* + * The blanking is set using a sync event (4 bytes) + * and a blanking packet (4 bytes + payload + 2 + * bytes). Its minimal size is therefore 10 bytes. + */ #define HBLK_PACKET_OVERHEAD 10 - hblk = max((unsigned int)HBLK_PACKET_OVERHEAD, - (mode->htotal - (mode->hsync_end - mode->hsync_start)) * Bpp - - HBLK_PACKET_OVERHEAD); + hblk = max((unsigned int)HBLK_PACKET_OVERHEAD, + (mode->htotal - (mode->hsync_end - mode->hsync_start)) * Bpp - + HBLK_PACKET_OVERHEAD); - if (device->lanes == 4) - vblk = sun6i_dsi_get_timings_vblk(dsi, mode, hblk); - } + if (device->lanes == 4) + vblk = sun6i_dsi_get_timings_vblk(dsi, mode, hblk); +alloc_buf: /* How many bytes do we need to send all payloads? */ bytes = max_t(size_t, max(max(hfp, hblk), max(hsa, hbp)), vblk); buffer = kmalloc(bytes, GFP_KERNEL); -- 2.18.0.321.gffc6fa0e3 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-03-03 17:36 UTC|newest] Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-03-03 17:35 [PATCH v9 0/5] drm/sun4i: sun6i_mipi_dsi: Fixes/updates Jagan Teki 2019-03-03 17:35 ` Jagan Teki 2019-03-03 17:35 ` Jagan Teki 2019-03-03 17:35 ` [PATCH v9 1/5] drm/sun4i: sun6i_mipi_dsi: Fix hsync_porch overflow Jagan Teki 2019-03-03 17:35 ` Jagan Teki 2019-03-03 17:35 ` Jagan Teki 2019-03-04 15:54 ` Maxime Ripard 2019-03-04 15:54 ` Maxime Ripard 2019-03-06 19:02 ` Jagan Teki 2019-03-06 19:02 ` Jagan Teki 2019-03-06 19:02 ` Jagan Teki 2019-03-03 17:35 ` [PATCH v9 2/5] drm/sun4i: sun6i_mipi_dsi: Fix TCON DRQ set bits Jagan Teki 2019-03-03 17:35 ` Jagan Teki 2019-03-03 17:35 ` Jagan Teki 2019-03-04 15:43 ` Maxime Ripard 2019-03-04 15:43 ` Maxime Ripard 2019-03-04 15:43 ` Maxime Ripard 2019-03-07 12:19 ` Jagan Teki 2019-03-07 15:39 ` Maxime Ripard 2019-03-07 15:39 ` Maxime Ripard 2019-03-07 15:39 ` Maxime Ripard 2019-03-07 15:54 ` Jagan Teki 2019-03-07 15:54 ` Jagan Teki 2019-03-11 14:09 ` Maxime Ripard 2019-03-11 14:09 ` Maxime Ripard 2019-03-11 14:09 ` Maxime Ripard 2019-03-11 14:58 ` Jagan Teki 2019-03-11 14:58 ` Jagan Teki 2019-03-19 10:56 ` Maxime Ripard 2019-03-19 10:56 ` Maxime Ripard 2019-03-19 10:56 ` Maxime Ripard 2019-03-28 11:53 ` Jagan Teki 2019-03-28 11:53 ` Jagan Teki 2019-03-28 11:53 ` Jagan Teki 2019-04-02 14:47 ` Maxime Ripard 2019-04-02 14:47 ` Maxime Ripard 2019-03-03 17:35 ` [PATCH v9 3/5] drm/sun4i: sun6i_mipi_dsi: Support vblk timing for 4-lane devices Jagan Teki 2019-03-03 17:35 ` Jagan Teki 2019-03-03 17:35 ` Jagan Teki 2019-03-04 15:49 ` Maxime Ripard 2019-03-04 15:49 ` Maxime Ripard 2019-03-04 15:49 ` Maxime Ripard 2019-03-07 16:03 ` Jagan Teki 2019-03-07 16:03 ` Jagan Teki 2019-03-07 16:03 ` Jagan Teki 2019-03-11 14:04 ` Maxime Ripard 2019-03-11 14:04 ` Maxime Ripard 2019-03-11 14:04 ` Maxime Ripard 2019-03-11 14:33 ` Jagan Teki 2019-03-11 14:33 ` Jagan Teki 2019-03-03 17:35 ` [PATCH v9 4/5] drm/sun4i: sun6i_mipi_dsi: Support DSI GENERIC_SHORT_WRITE_2 transfer Jagan Teki 2019-03-03 17:35 ` Jagan Teki 2019-03-03 17:35 ` Jagan Teki 2019-03-03 17:35 ` Jagan Teki [this message] 2019-03-03 17:35 ` [PATCH v9 5/5] drm/sun4i: sun6i_mipi_dsi: Simplify dsi setup timings code Jagan Teki 2019-03-04 15:50 ` Maxime Ripard 2019-03-04 15:50 ` Maxime Ripard 2019-03-04 15:50 ` Maxime Ripard 2019-03-07 11:46 ` Jagan Teki 2019-03-07 11:46 ` Jagan Teki 2019-03-18 18:28 ` [PATCH v9 0/5] drm/sun4i: sun6i_mipi_dsi: Fixes/updates Jagan Teki 2019-03-18 18:28 ` Jagan Teki 2019-03-18 18:28 ` Jagan Teki 2019-03-19 10:58 ` Maxime Ripard 2019-03-19 10:58 ` Maxime Ripard 2019-03-19 10:58 ` Maxime Ripard
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=20190303173527.31055-6-jagan@amarulasolutions.com \ --to=jagan@amarulasolutions.com \ --cc=airlied@linux.ie \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-amarula@amarulasolutions.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-sunxi@googlegroups.com \ --cc=maxime.ripard@bootlin.com \ --cc=michael@amarulasolutions.com \ --cc=wens@csie.org \ /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.