From patchwork Sun Mar 3 17:35:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 10837183 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0509D1399 for ; Sun, 3 Mar 2019 17:37:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E0A3729B96 for ; Sun, 3 Mar 2019 17:37:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D484529E86; Sun, 3 Mar 2019 17:37:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 458E029B96 for ; Sun, 3 Mar 2019 17:37:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=DwVl4J5c8oA6Yf2OgjEsLub37s91wysuX2voY0PdgVU=; b=LOZfrE9MhlAfD0 /9CbPs8C1yzePxLemNJIypHAR7aFO4Nv2gX8QiVmGtln8oNLS8XIRUOEvAgKAiz+9kfBw0cq30+sK BVfacSOrMu5ipDHFnkSTODMZq6hLgk+LwDQs7jXM3kyazLShNnp8njpemOVeFpVluknOGjadL80uC olXGleyu471zMlZmZI4uV6qapQ49vKEnvsX2Jy1kGdFnPlJNJzcl694AY2vf3EI0tmwokQpHuo4dy pvUdgWQMUz5sJcPUy0yZxbEBgdhDNvd4lHzRHt+NsVXGwe9LBeu9lRfiYXlmRFlTVlcW6Clk8QPBm f28nF8xSXsuYPrCQNh9w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h0V2y-0002vn-SP; Sun, 03 Mar 2019 17:37:08 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h0V2Q-000297-4T for linux-arm-kernel@lists.infradead.org; Sun, 03 Mar 2019 17:36:50 +0000 Received: by mail-pf1-x444.google.com with SMTP id s22so1300858pfh.4 for ; Sun, 03 Mar 2019 09:36:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nH8G1W2EgQa6aDAZzLfPouCwgu4asZ6FIPx9/UPBlXw=; b=m1FrEllfMfg/suYjQdH2Ti+ra+O0Y+MXCh1/x2MHp8Aczb3+Wpnapl0qsZLfY5SXmp c1Yn6AP9Fxv4Gt3zu3vta8gvNg54IrM2HCRcdP3i+bUyCBTeDbdvdQshM5IrbMZ0hEFZ Z6SNyVr4VObWmVbRbKbQWVY8aI73f5YfjHlgI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nH8G1W2EgQa6aDAZzLfPouCwgu4asZ6FIPx9/UPBlXw=; b=MGsnpixG2YUyfvRSO+jbMfHC1S1GdteC8qAN5ivTMANYPqN4/oXSzk8ne1rt/5B00I 2jP+nhbNlFcXTL4cBcrPATRJLBNEsknROX35wCPyuNYLHbnKFKh0y8XBcjvQaA7B28RT ganRqMkZvW5VhGW2TBCUuzocXwgKjrwD4khHb565fcoFT/7yhhG1ZHk8IOHfyJqbnZ9g SPx6sq5yw0Rq25prJEdNIFSMBADQTPgUZfqygpRmsNQvD9+uODUNuQLylsMubheNrDtH x5OQx+k4oBCiGoMw9w4HHoxwOGEmDsJtdqJ3PRuJcQjcyEqBj7NfVpXbWUK9QaEGWsgO M8Aw== X-Gm-Message-State: AHQUAuYjXue6YuPEAewL/yfijr99xIFiP75dTuQd2+8K/9hV4xI/5/Es gfvpxR4Zb9C96rXjT0WPC7RBpQ== X-Google-Smtp-Source: AHgI3IagjBeD7CYWDO3mg/s0XAZehQj9szKzEtW7vEEHLwfsdUn/ST4V3eOL+zwMZQHQsdIkEImAjw== X-Received: by 2002:a62:76c9:: with SMTP id r192mr16283667pfc.251.1551634593359; Sun, 03 Mar 2019 09:36:33 -0800 (PST) Received: from localhost.localdomain ([115.97.184.151]) by smtp.gmail.com with ESMTPSA id d129sm5614737pgc.59.2019.03.03.09.36.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Mar 2019 09:36:32 -0800 (PST) From: Jagan Teki To: Maxime Ripard , David Airlie , Daniel Vetter , Chen-Yu Tsai Subject: [PATCH v9 5/5] drm/sun4i: sun6i_mipi_dsi: Simplify dsi setup timings code Date: Sun, 3 Mar 2019 23:05:27 +0530 Message-Id: <20190303173527.31055-6-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190303173527.31055-1-jagan@amarulasolutions.com> References: <20190303173527.31055-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190303_093634_881010_145F0544 X-CRM114-Status: GOOD ( 16.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sunxi@googlegroups.com, Jagan Teki , Michael Trimarchi , linux-amarula@amarulasolutions.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Tested-by: Merlijn Wajer --- 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);