From patchwork Sat Aug 31 07:50:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 172713 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1677205ily; Sat, 31 Aug 2019 00:52:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqwFQZIhVd6XHaowhq0hjWajtLjHJRkiNUdRp9259rhjgGJ/WxL6Ddsu6t0uWgg5qLtcRkiL X-Received: by 2002:a62:e516:: with SMTP id n22mr23202045pff.105.1567237945477; Sat, 31 Aug 2019 00:52:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567237945; cv=none; d=google.com; s=arc-20160816; b=KQthRwUo0rGeLEisZJFpv0c3UHpOXLT5r3jEIiOv5BnASrGcF4mVGXeKANBTdrMvAk rlTN0xyUTlqwoBugmS8PV5+7qq6pkFWpoIATj/XGZwBAglwatfiWq7LS/J+aa1l8lP+1 8/HPyocH1DAWdZ5CEkgmT2HAS0KQ5VkEXOmLDYH5LTwJM1hetPEP93qz3Cle6Ch01QoJ lFatroJxbjYM3yH2LmKf+glSXE5lKVKrSKO7y11TpLA6xB4/qrj59FPLqAFw33nBFm9O mMuG7G3sa1uNj7GUtAa+yZufa5+Xmh23DwrVt1CsSaS7wsjk9sD7tw9WvJg2Jd4xVNnI SyiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:message-id:date:subject:to:from :delivered-to; bh=pEB2PV3HHBOsiU6u9Mv2XFwJBWszx7SDRFTcSf9Mhk8=; b=iOE4ziGRhCrqbDyCXx3VX6rRxz8HJXir3iFxZsVJB2fHWNbi/DNKUjcaytvuQV+NY7 U8a/JTzU51y1NFnUmfG3gSllq7MDJh+45wnKLoKrGcqOks/ZYDqs6oK33Czq8mvcKQ59 27hfEuupZTwfvBA1LboHMgYPvZWvtJ4AYdyG7EdC79YkLIOxWvNcx5iiDr/aKmyXlB+I Cn1vDM3Ovt45eQKXZNzl/7zTTOKsdMYPLoFqiLZccqySKCpKtMHVx07QMUUcsRVeOHep zo5qGKtTToVe4wcXS/A0zc6tQi9iIK0TbzkBQin/IM1DdujznzcWinvUYAthOnanWxWx FYOA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id y8si6217132pgv.541.2019.08.31.00.52.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 31 Aug 2019 00:52:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D47946E176; Sat, 31 Aug 2019 07:52:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x144.google.com (mail-lf1-x144.google.com [IPv6:2a00:1450:4864:20::144]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1E3A26E176 for ; Sat, 31 Aug 2019 07:52:21 +0000 (UTC) Received: by mail-lf1-x144.google.com with SMTP id w67so7003421lff.4 for ; Sat, 31 Aug 2019 00:52:20 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=m7t5bna/9+fFfJEvfP+dAeP8Wxc4OTn6267mtN/Kweg=; b=Nno4k2JaOfHNBUlDsNWoiLa0Mr79C2v9y0MeWP8N7m5G3EpODvX5aZt6oXR41iSfzM eYzPvgNaXsm6N7/IbXlMS9oStyyKjR0lgPHTLhf2MusHJvuWC9uBrYrDUnOOr0aV1SS3 0XM4OC9mb6axg1g8C6ir3ShL+M6A3ud4LyfixOLn6g3QhZIwqBmENgVy6ZYbOQvq/kHm 1z1SSVFT9vpyHsCRtumQetpeqZZFuLNhCmjEyluGN/ySVMLvmFDbeY0I8Wsvh4YmMkXe WjGt9QgAMLcEHUV0IJzLcndXVoht1LaN4Dk19Cw+ulDjM5tCnHWETlqBZ47N5IhIeXaA s8Xg== X-Gm-Message-State: APjAAAVs1EfVvXs3aetlFWEkNhPY4uI7AZo1Kb7X/tzzwBGLolM3gUrn qLDmY5ddJC7E3gQsKHbiJvVQbWKAlKeY0A== X-Received: by 2002:ac2:5637:: with SMTP id b23mr12269613lff.186.1567237939026; Sat, 31 Aug 2019 00:52:19 -0700 (PDT) Received: from localhost.localdomain (c-79c8225c.014-348-6c756e10.bbcust.telenor.se. [92.34.200.121]) by smtp.gmail.com with ESMTPSA id b25sm1520040lfa.90.2019.08.31.00.52.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Aug 2019 00:52:17 -0700 (PDT) From: Linus Walleij To: dri-devel@lists.freedesktop.org, Maarten Lankhorst , Maxime Ripard , Sean Paul Subject: [PATCH v2] drm/mcde: Fix DSI transfers Date: Sat, 31 Aug 2019 09:50:13 +0200 Message-Id: <20190831075013.21993-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=m7t5bna/9+fFfJEvfP+dAeP8Wxc4OTn6267mtN/Kweg=; b=yAegXm0VNTIg6rQnjPMp5Z31fTySbrxd5/3sfIzT5/1XrRrx8ij0XOV96yRc1CO3O0 fxV1z/xDphPE565b2lrCwRzRCpfmm8+eBN8iLxf3XLnIfLoGtqRNIE40u+EGzrv55o9a 9fu2RgvKjvAc6K5A++tMSw4nrBUtFaZzmhwviDt+6PkeAO3+G9jQOdX1n7Dj+zU6MGZg CTHByZO7erxmwANMOQ0IGEB8XEW2JUSCCFrRm6xOZVVV4ogtP4ObxTIzUqq8mu/9M2mp WQ6GGcnAcbxhJbG/6/WoXbXkgh5YdXcem9ofhskMAUqWC7LPyrD9Q9EWqBvyAFt9GZR4 /9Bw== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephan Gerhold , linux-arm-kernel@lists.infradead.org, kbuild test robot Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" There were bugs in the DSI transfer (read and write) function as it was only tested with displays ever needing a single byte to be written. Fixed it up and tested so we can now write messages of up to 16 bytes and read up to 4 bytes from the display. Tested with a Sony ACX424AKP display: this display now self- identifies and can control backlight in command mode. Cc: Stephan Gerhold Reported-by: kbuild test robot Fixes: 5fc537bfd000 ("drm/mcde: Add new driver for ST-Ericsson MCDE") Signed-off-by: Linus Walleij Reviewed-by: Stephan Gerhold --- ChangeLog v1->v2: - Fix a print modifier for dev_err() found by the build robot. --- drivers/gpu/drm/mcde/mcde_dsi.c | 70 ++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/mcde/mcde_dsi.c b/drivers/gpu/drm/mcde/mcde_dsi.c index 07f7090d08b3..90659d190d78 100644 --- a/drivers/gpu/drm/mcde/mcde_dsi.c +++ b/drivers/gpu/drm/mcde/mcde_dsi.c @@ -178,22 +178,26 @@ static ssize_t mcde_dsi_host_transfer(struct mipi_dsi_host *host, const u32 loop_delay_us = 10; /* us */ const u8 *tx = msg->tx_buf; u32 loop_counter; - size_t txlen; + size_t txlen = msg->tx_len; + size_t rxlen = msg->rx_len; u32 val; int ret; int i; - txlen = msg->tx_len; - if (txlen > 12) { + if (txlen > 16) { dev_err(d->dev, - "dunno how to write more than 12 bytes yet\n"); + "dunno how to write more than 16 bytes yet\n"); + return -EIO; + } + if (rxlen > 4) { + dev_err(d->dev, + "dunno how to read more than 4 bytes yet\n"); return -EIO; } dev_dbg(d->dev, - "message to channel %d, %zd bytes", - msg->channel, - txlen); + "message to channel %d, write %zd bytes read %zd bytes\n", + msg->channel, txlen, rxlen); /* Command "nature" */ if (MCDE_DSI_HOST_IS_READ(msg->type)) @@ -210,9 +214,7 @@ static ssize_t mcde_dsi_host_transfer(struct mipi_dsi_host *host, if (mipi_dsi_packet_format_is_long(msg->type)) val |= DSI_DIRECT_CMD_MAIN_SETTINGS_CMD_LONGNOTSHORT; val |= 0 << DSI_DIRECT_CMD_MAIN_SETTINGS_CMD_ID_SHIFT; - /* Add one to the length for the MIPI DCS command */ - val |= txlen - << DSI_DIRECT_CMD_MAIN_SETTINGS_CMD_SIZE_SHIFT; + val |= txlen << DSI_DIRECT_CMD_MAIN_SETTINGS_CMD_SIZE_SHIFT; val |= DSI_DIRECT_CMD_MAIN_SETTINGS_CMD_LP_EN; val |= msg->type << DSI_DIRECT_CMD_MAIN_SETTINGS_CMD_HEAD_SHIFT; writel(val, d->regs + DSI_DIRECT_CMD_MAIN_SETTINGS); @@ -249,17 +251,36 @@ static ssize_t mcde_dsi_host_transfer(struct mipi_dsi_host *host, writel(1, d->regs + DSI_DIRECT_CMD_SEND); loop_counter = 1000 * 1000 / loop_delay_us; - while (!(readl(d->regs + DSI_DIRECT_CMD_STS) & - DSI_DIRECT_CMD_STS_WRITE_COMPLETED) - && --loop_counter) - usleep_range(loop_delay_us, (loop_delay_us * 3) / 2); - - if (!loop_counter) { - dev_err(d->dev, "DSI write timeout!\n"); - return -ETIME; + if (MCDE_DSI_HOST_IS_READ(msg->type)) { + /* Read command */ + while (!(readl(d->regs + DSI_DIRECT_CMD_STS) & + (DSI_DIRECT_CMD_STS_READ_COMPLETED | + DSI_DIRECT_CMD_STS_READ_COMPLETED_WITH_ERR)) + && --loop_counter) + usleep_range(loop_delay_us, (loop_delay_us * 3) / 2); + if (!loop_counter) { + dev_err(d->dev, "DSI write timeout!\n"); + return -ETIME; + } + } else { + /* Writing only */ + while (!(readl(d->regs + DSI_DIRECT_CMD_STS) & + DSI_DIRECT_CMD_STS_WRITE_COMPLETED) + && --loop_counter) + usleep_range(loop_delay_us, (loop_delay_us * 3) / 2); + + if (!loop_counter) { + dev_err(d->dev, "DSI write timeout!\n"); + return -ETIME; + } } val = readl(d->regs + DSI_DIRECT_CMD_STS); + if (val & DSI_DIRECT_CMD_STS_READ_COMPLETED_WITH_ERR) { + dev_err(d->dev, "read completed with error\n"); + writel(1, d->regs + DSI_DIRECT_CMD_RD_INIT); + return -EIO; + } if (val & DSI_DIRECT_CMD_STS_ACKNOWLEDGE_WITH_ERR_RECEIVED) { val >>= DSI_DIRECT_CMD_STS_ACK_VAL_SHIFT; dev_err(d->dev, "error during transmission: %04x\n", @@ -269,10 +290,7 @@ static ssize_t mcde_dsi_host_transfer(struct mipi_dsi_host *host, if (!MCDE_DSI_HOST_IS_READ(msg->type)) { /* Return number of bytes written */ - if (mipi_dsi_packet_format_is_long(msg->type)) - ret = 4 + txlen; - else - ret = 4; + ret = txlen; } else { /* OK this is a read command, get the response */ u32 rdsz; @@ -282,7 +300,13 @@ static ssize_t mcde_dsi_host_transfer(struct mipi_dsi_host *host, rdsz = readl(d->regs + DSI_DIRECT_CMD_RD_PROPERTY); rdsz &= DSI_DIRECT_CMD_RD_PROPERTY_RD_SIZE_MASK; rddat = readl(d->regs + DSI_DIRECT_CMD_RDDAT); - for (i = 0; i < 4 && i < rdsz; i++) + if (rdsz < rxlen) { + dev_err(d->dev, "read error, requested %zd got %d\n", + msg->rx_len, rdsz); + return -EIO; + } + /* FIXME: read more than 4 bytes */ + for (i = 0; i < 4 && i < rxlen; i++) rx[i] = (rddat >> (i * 8)) & 0xff; ret = rdsz; }