From patchwork Wed Jun 12 08:32:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10991275 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 040C7924 for ; Thu, 13 Jun 2019 07:29:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7F32204C1 for ; Thu, 13 Jun 2019 07:29:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC4822887B; Thu, 13 Jun 2019 07:29:02 +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_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8AFF4204C1 for ; Thu, 13 Jun 2019 07:29:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DD4DD8933C; Thu, 13 Jun 2019 07:28:07 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id F0A79892D8 for ; Wed, 12 Jun 2019 08:33:14 +0000 (UTC) Received: by mail-pf1-x444.google.com with SMTP id a186so9220121pfa.5 for ; Wed, 12 Jun 2019 01:33:14 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=LVdZCLFy6QEDGvyvStVGqispy/JrU6lkx44tS0r6TYo=; b=SiXhbQyVWUmO3h4IWdXudOpuQuWhcLxEL2YMvIg5uSHSMv8P2fBOa/DzITMvZxjiWK JjMObuMdz/enB8G1HpVMA9L1F2k0GjmnoM5GPjdsc2QIscLrVUAxzGhXAV4tAyKGggqs Emniutj539GNRnlHj4a4sYwskc1uXCWjvKJ6JoeAzv5/nSKRjhoO9UB9QuNlvrQlJDKz 2OqY4TtF/lf9k7cowz/SmQepLNPg3tcu9DrHhsA6iUWiWV+Z8probeXxk8/K81qnroXe rQkGVbQ6rFYVq+z03GOHsHz94rCYAqpipz/jWvIthWAuo+sHvpjz+0+WSmutdDaJgzL5 58Aw== X-Gm-Message-State: APjAAAXeSQa/tVyAi6cL4lPvbSL1i6iG9d5Te6RIGHBzLTo2ULBS4ifE 7ifirfsqnu4/MrcTGuNJOytmdGSN9Ps= X-Google-Smtp-Source: APXvYqxwac8t/w9FHxZ8pFvq8zaU82WOfOOMYMbMWsMabAk3eaNlCmW35IaZ5yFdd/dAGwB+P8Kg6g== X-Received: by 2002:a62:7d13:: with SMTP id y19mr26901449pfc.62.1560328394213; Wed, 12 Jun 2019 01:33:14 -0700 (PDT) Received: from localhost.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id d21sm18845991pfr.162.2019.06.12.01.33.12 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 12 Jun 2019 01:33:13 -0700 (PDT) From: Andrey Smirnov To: dri-devel@lists.freedesktop.org Subject: [PATCH v5 06/15] drm/bridge: tc358767: Simplify AUX data read Date: Wed, 12 Jun 2019 01:32:43 -0700 Message-Id: <20190612083252.15321-7-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190612083252.15321-1-andrew.smirnov@gmail.com> References: <20190612083252.15321-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 13 Jun 2019 07:27:23 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LVdZCLFy6QEDGvyvStVGqispy/JrU6lkx44tS0r6TYo=; b=ebH+e+yRL03RD84DE66s1KelaR+9leWYSMIwRIAWYA5aXrQAAkVvL2oCcizYNskH02 MIL5/ZHmccqPa/hYl2SfmClEogn4UxqAKKoOdJ/Y+dUjX+xGRD7r9jViQDAMPkCadeUi xsx07/ikMU88hRqRIuygDMj3xWF/S7eBmhkptKjJvSnhEoInIc9Reh1QpdM25KXHVfja XGaBSoWYfRtxQopXIjLMdqz3es4WwYhkrsBtfCPtyZCLpBoS3/qVaz+JvybH9syeFOzV HfZ0vKVBOP/dvWqH8Jd7nm/arv+NBZ8SJLEG53JUu6MiBqXBEjO4Qm/bmR6o/HH0zVvw lcoA== 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: Cory Tusar , Andrey Smirnov , Andrey Gusakov , linux-kernel@vger.kernel.org, Tomi Valkeinen , Laurent Pinchart , Chris Healy Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Simplify AUX data read by removing index arithmetic and shifting with a helper function that does two things: 1. Fetch data from up to 4 32-bit registers from the chip 2. Copy read data into user provided array. Signed-off-by: Andrey Smirnov Reviewed-by: Andrzej Hajda Cc: Andrzej Hajda Cc: Laurent Pinchart Cc: Tomi Valkeinen Cc: Andrey Gusakov Cc: Philipp Zabel Cc: Cory Tusar Cc: Chris Healy Cc: Lucas Stach Cc: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org --- drivers/gpu/drm/bridge/tc358767.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index 7b15caec2ce5..7152b44db8a3 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -321,6 +321,20 @@ static int tc_aux_get_status(struct tc_data *tc, u8 *reply) return 0; } +static int tc_aux_read_data(struct tc_data *tc, void *data, size_t size) +{ + u32 auxrdata[DP_AUX_MAX_PAYLOAD_BYTES / sizeof(u32)]; + int ret, count = ALIGN(size, sizeof(u32)); + + ret = regmap_raw_read(tc->regmap, DP0_AUXRDATA(0), auxrdata, count); + if (ret) + return ret; + + memcpy(data, auxrdata, size); + + return size; +} + static ssize_t tc_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) { @@ -379,19 +393,10 @@ static ssize_t tc_aux_transfer(struct drm_dp_aux *aux, if (ret) return ret; - if (request == DP_AUX_I2C_READ || request == DP_AUX_NATIVE_READ) { - /* Read data */ - while (i < size) { - if ((i % 4) == 0) { - ret = regmap_read(tc->regmap, - DP0_AUXRDATA(i >> 2), &tmp); - if (ret) - return ret; - } - buf[i] = tmp & 0xff; - tmp = tmp >> 8; - i++; - } + switch (request) { + case DP_AUX_NATIVE_READ: + case DP_AUX_I2C_READ: + return tc_aux_read_data(tc, msg->buffer, size); } return size;