From patchwork Mon Mar 12 09:54:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meghana Madhyastha X-Patchwork-Id: 10275851 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 78584601A0 for ; Mon, 12 Mar 2018 09:55:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5DDD528CDB for ; Mon, 12 Mar 2018 09:55:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 52B2E28CE1; Mon, 12 Mar 2018 09:55:09 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9AEF28CDB for ; Mon, 12 Mar 2018 09:55:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752451AbeCLJzF (ORCPT ); Mon, 12 Mar 2018 05:55:05 -0400 Received: from mail-io0-f196.google.com ([209.85.223.196]:33587 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932385AbeCLJzD (ORCPT ); Mon, 12 Mar 2018 05:55:03 -0400 Received: by mail-io0-f196.google.com with SMTP id f1so10724589iob.0 for ; Mon, 12 Mar 2018 02:55:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=KYdh27IMozj2vq/dVSzRiEnDwAO3eWrOLXriE8+3wjU=; b=RWBXXr+JOGAxMQPgoaF7ieEBSSvyuFARnQaFz3WfiVMZQm1zaaxzamj5k27DcbbKE1 LN99EZOfIN50FxPYtiAACvZpjM/NK6QyOdGYzECoiB40WBK3lkfrbueRYvsKxeiMC5Je zeD3ghPlQ9SGWhRYy6Z+czLaxN15fUwu9W1hGdQCDlBf7GUQwME6BhSFIxXIwaym2ADL QAX4ovXvH9LI2iqh4j1bPmOdu57G8wapNY/gbYGW5nQ54FxC0TpoaSHTMKBXXTU33wuZ f9wOnfFFK4IHf+k5ZvAvWBRH3xFFWf3FMKd4kiCTF5zmyJY/kWJbqzd1XfOZfX4f79P/ wr9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=KYdh27IMozj2vq/dVSzRiEnDwAO3eWrOLXriE8+3wjU=; b=GGvf6PorKTPgEasu+sW3+NalEiEvdu5S86yLieX1CBw9ZBbkfuNqtAwRllO9/7NkUR ykF1KhXc58AGeZQyVsBGW4FTGbtTYPQBkhssGY4tHHIWzSX/FCH2+wIPkGP4RJUYEy8j 5YXYsWaitGhx6db1WSTYXXoc143BFvocEBzfN4XQlg4gkZkGcGNrXEUdfetlu9Qmnu/K 17vGMwmvYDJ3mlhj8Cd1daaKfUsbJj0UH0TGvOoz3pkmdbAnArjQM6JJrnIhhbrHw6Ya nnthh9o6QbCMH/gibZxOOlpsWVxDYUbC6wapjoyTadskpiKwLFa5qaxgyQU5pxHldguz +/nw== X-Gm-Message-State: AElRT7EsKOV0fxY7ypiTHumlBOZO+N4u5Lr3xQZEuTD5YjPBNOeiWcqU 7SOZMRiyLQ7UjOifg+RrsbA= X-Google-Smtp-Source: AG47ELt7f2xSBgqffaHf+mrCAy6xack6X1+7YbOu+UaXz0tv+4On4FyXQcojR7TQ/iPn/JrvqKMstw== X-Received: by 10.107.97.17 with SMTP id v17mr1555808iob.256.1520848502798; Mon, 12 Mar 2018 02:55:02 -0700 (PDT) Received: from raspberrypi ([122.172.126.13]) by smtp.gmail.com with ESMTPSA id g9sm2462009ioi.87.2018.03.12.02.54.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Mar 2018 02:55:01 -0700 (PDT) Date: Mon, 12 Mar 2018 09:54:57 +0000 From: Meghana Madhyastha To: Mark Brown , Daniel Vetter , linux-spi@vger.kernel.org, Noralf =?iso-8859-1?Q?Tr=F8nnes?= , Sean Paul , dri-devel@lists.freedesktop.org Subject: [PATCH v3 2/2] drm/tinydrm: Remove chunk splitting in tinydrm_spi_transfer Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove chunk splitting in tinydrm_spi_transfer in tinydrm-helpers as the spi core will split a buffer into max_dma_len chunks for the spi controller driver to handle, automatic byte swapping in tinydrm_spi_transfer as it doesn't have users. Signed-off-by: Meghana Madhyastha --- drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 80 ++------------------------ drivers/gpu/drm/tinydrm/mipi-dbi.c | 10 +--- 2 files changed, 8 insertions(+), 82 deletions(-) diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c b/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c index bf96072d1b97..d7cbbbe2fda0 100644 --- a/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c +++ b/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c @@ -334,35 +334,6 @@ EXPORT_SYMBOL(tinydrm_disable_backlight); #if IS_ENABLED(CONFIG_SPI) /** - * tinydrm_spi_max_transfer_size - Determine max SPI transfer size - * @spi: SPI device - * @max_len: Maximum buffer size needed (optional) - * - * This function returns the maximum size to use for SPI transfers. It checks - * the SPI master, the optional @max_len and the module parameter spi_max and - * returns the smallest. - * - * Returns: - * Maximum size for SPI transfers - */ -size_t tinydrm_spi_max_transfer_size(struct spi_device *spi, size_t max_len) -{ - size_t ret; - - ret = min(spi_max_transfer_size(spi), spi->master->max_dma_len); - if (max_len) - ret = min(ret, max_len); - if (spi_max) - ret = min_t(size_t, ret, spi_max); - ret &= ~0x3; - if (ret < 4) - ret = 4; - - return ret; -} -EXPORT_SYMBOL(tinydrm_spi_max_transfer_size); - -/** * tinydrm_spi_bpw_supported - Check if bits per word is supported * @spi: SPI device * @bpw: Bits per word @@ -452,62 +423,23 @@ int tinydrm_spi_transfer(struct spi_device *spi, u32 speed_hz, struct spi_transfer tr = { .bits_per_word = bpw, .speed_hz = speed_hz, + .tx_buf = buf, + .len = len }; struct spi_message m; - u16 *swap_buf = NULL; - size_t max_chunk; - size_t chunk; - int ret = 0; - - if (WARN_ON_ONCE(bpw != 8 && bpw != 16)) - return -EINVAL; - - max_chunk = tinydrm_spi_max_transfer_size(spi, 0); if (drm_debug & DRM_UT_DRIVER) - pr_debug("[drm:%s] bpw=%u, max_chunk=%zu, transfers:\n", - __func__, bpw, max_chunk); - - if (bpw == 16 && !tinydrm_spi_bpw_supported(spi, 16)) { - tr.bits_per_word = 8; - if (tinydrm_machine_little_endian()) { - swap_buf = kmalloc(min(len, max_chunk), GFP_KERNEL); - if (!swap_buf) - return -ENOMEM; - } - } + pr_debug("[drm:%s] bpw=%u, transfers:\n", + __func__, bpw); spi_message_init(&m); if (header) spi_message_add_tail(header, &m); spi_message_add_tail(&tr, &m); - while (len) { - chunk = min(len, max_chunk); - - tr.tx_buf = buf; - tr.len = chunk; - - if (swap_buf) { - const u16 *buf16 = buf; - unsigned int i; - - for (i = 0; i < chunk / 2; i++) - swap_buf[i] = swab16(buf16[i]); - - tr.tx_buf = swap_buf; - } - - buf += chunk; - len -= chunk; - - tinydrm_dbg_spi_message(spi, &m); - ret = spi_sync(spi, &m); - if (ret) - return ret; - } + tinydrm_dbg_spi_message(spi, &m); - return 0; + return spi_sync(spi, &m); } EXPORT_SYMBOL(tinydrm_spi_transfer); diff --git a/drivers/gpu/drm/tinydrm/mipi-dbi.c b/drivers/gpu/drm/tinydrm/mipi-dbi.c index 75dd65c57e74..c8af2d65c2ad 100644 --- a/drivers/gpu/drm/tinydrm/mipi-dbi.c +++ b/drivers/gpu/drm/tinydrm/mipi-dbi.c @@ -886,15 +886,9 @@ static int mipi_dbi_typec3_command(struct mipi_dbi *mipi, u8 cmd, int mipi_dbi_spi_init(struct spi_device *spi, struct mipi_dbi *mipi, struct gpio_desc *dc) { - size_t tx_size = tinydrm_spi_max_transfer_size(spi, 0); struct device *dev = &spi->dev; int ret; - if (tx_size < 16) { - DRM_ERROR("SPI transmit buffer too small: %zu\n", tx_size); - return -EINVAL; - } - /* * Even though it's not the SPI device that does DMA (the master does), * the dma mask is necessary for the dma_alloc_wc() in @@ -924,8 +918,8 @@ int mipi_dbi_spi_init(struct spi_device *spi, struct mipi_dbi *mipi, mipi->swap_bytes = true; } else { mipi->command = mipi_dbi_typec1_command; - mipi->tx_buf9_len = tx_size; - mipi->tx_buf9 = devm_kmalloc(dev, tx_size, GFP_KERNEL); + mipi->tx_buf9_len = SZ_16K; + mipi->tx_buf9 = devm_kmalloc(dev, mipi->tx_buf9_len, GFP_KERNEL); if (!mipi->tx_buf9) return -ENOMEM; }