From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72C9833E5 for ; Wed, 27 Apr 2022 19:16:20 +0000 (UTC) Received: by mail-ed1-f48.google.com with SMTP id k27so3070270edk.4 for ; Wed, 27 Apr 2022 12:16:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hLJNnGvrtFAOmeWj5ZA0YmApkwdPTHpKx7WHp64IaXc=; b=BoaCeMQf2eJz88iZi8aPpusPSKfMdOwUxqV+E7OG7lHaoEa8LCQRN73oHJYeY4aSB2 VGeJHCUzQVNLlNLTt+8QM9NlL4GOlzEZP8HH265LD/MVHCmGrcZNii5fb+RWwVKeJZG9 CxyfyJZLMZ92m2h7eTIYr2aJBqp0X3RR+b95kGQks5dIQaFw3ClbFFUbQcJBcxPDJkgK 0MFA2S2N3hNwUK0wqQfIFowWTMZL+aJ0qMonkt5RFCrywZASeZ5WEAVLZpAYBlAGg/c8 Kmiy4YI211AbCaRxK6fx1V4vP9MqC+Z8sz0RFHfoilS0JWq58Nv5IubOlF53A9cTT2dD ccDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hLJNnGvrtFAOmeWj5ZA0YmApkwdPTHpKx7WHp64IaXc=; b=xxmB/t6XPpvxWi1lylbMYQiTSYrRtV9OQwHSacRIhi/acsFzKHb4gX29aYPlwVND4Y KGYGJzCA5IuIgsDnG39SpBZtq0q+B0SHqgqEgb7kz5i3V9YLlPrg2TvP+2PjfNYIWQBR f0mKCWY5s2vRJgB6qygRCW3YH3eMvYZeL+z34Jbx2KT5zpGoLfImIrLHwv5TYaMoQW4X 0/TjIASrUa7SQcfdQumLKCfpw3kLP7lRP3WqI+dHHH/fxASYWzTF5l8eR/k1vmX/GLVg JcRBz9LSe/LXQG2GW3KboZUgJLw9xUxtaVIQwuTmnGj2edMYR3lezT27E8T7B9Ugmvrc UDpg== X-Gm-Message-State: AOAM531zIr0U9bZyXR7LVFqjt3Tru0B4SF+iz5gbMMIy9EFy1MsXY0X1 +vx8wp1tGhtnMdPGEQmqRSw= X-Google-Smtp-Source: ABdhPJxqRqhCCImvZlg7ccRWir1+Asr7VdaNmzUyAraKohzOQR2qiTN2ZHRF78lYLEWMpStyZQGOPQ== X-Received: by 2002:aa7:c70f:0:b0:425:f70d:b34 with SMTP id i15-20020aa7c70f000000b00425f70d0b34mr13637098edq.306.1651086978704; Wed, 27 Apr 2022 12:16:18 -0700 (PDT) Received: from jernej-laptop.localnet (89-212-118-115.static.t-2.net. [89.212.118.115]) by smtp.gmail.com with ESMTPSA id r2-20020aa7c142000000b0042617ba63c5sm58674edp.79.2022.04.27.12.16.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 12:16:18 -0700 (PDT) From: Jernej =?utf-8?B?xaBrcmFiZWM=?= To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, Paul Kocialkowski Cc: Yong Deng , Paul Kocialkowski , Mauro Carvalho Chehab , Chen-Yu Tsai , Samuel Holland , Laurent Pinchart , Maxime Ripard , Thomas Petazzoni Subject: Re: [PATCH v4 21/45] media: sun6i-csi: Implement address configuration without indirection Date: Wed, 27 Apr 2022 21:16:17 +0200 Message-ID: <21443501.EfDdHjke4D@jernej-laptop> In-Reply-To: <20220415152811.636419-22-paul.kocialkowski@bootlin.com> References: <20220415152811.636419-1-paul.kocialkowski@bootlin.com> <20220415152811.636419-22-paul.kocialkowski@bootlin.com> Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Dne petek, 15. april 2022 ob 17:27:47 CEST je Paul Kocialkowski napisal(a): > Instead of calculating the planar_offset at one point and using it > later in a dedicated function, reimplement address configuration > with v4l2 format info in the buffer_configure function. > > Signed-off-by: Paul Kocialkowski Acked-by: Jernej Skrabec Best regards, Jernej > --- > .../platform/sunxi/sun6i-csi/sun6i_csi.c | 27 ---------------- > .../platform/sunxi/sun6i-csi/sun6i_csi.h | 10 ------ > .../sunxi/sun6i-csi/sun6i_csi_capture.c | 32 ++++++++++++++++++- > 3 files changed, 31 insertions(+), 38 deletions(-) > > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c index > c7b53e8099d3..98133c1dbf68 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > @@ -463,7 +463,6 @@ static void sun6i_csi_set_window(struct sun6i_csi_device > *csi_dev) struct sun6i_csi_config *config = &csi_dev->config; > u32 bytesperline_y; > u32 bytesperline_c; > - int *planar_offset = csi_dev->planar_offset; > u32 width = config->width; > u32 height = config->height; > u32 hor_len = width; > @@ -488,7 +487,6 @@ static void sun6i_csi_set_window(struct sun6i_csi_device > *csi_dev) SUN6I_CSI_CH_VSIZE_LEN(height) | > SUN6I_CSI_CH_VSIZE_START(0)); > > - planar_offset[0] = 0; > switch (config->pixelformat) { > case V4L2_PIX_FMT_NV12_16L16: > case V4L2_PIX_FMT_NV12: > @@ -497,23 +495,15 @@ static void sun6i_csi_set_window(struct > sun6i_csi_device *csi_dev) case V4L2_PIX_FMT_NV61: > bytesperline_y = width; > bytesperline_c = width; > - planar_offset[1] = bytesperline_y * height; > - planar_offset[2] = -1; > break; > case V4L2_PIX_FMT_YUV420: > case V4L2_PIX_FMT_YVU420: > bytesperline_y = width; > bytesperline_c = width / 2; > - planar_offset[1] = bytesperline_y * height; > - planar_offset[2] = planar_offset[1] + > - bytesperline_c * height / 2; > break; > case V4L2_PIX_FMT_YUV422P: > bytesperline_y = width; > bytesperline_c = width / 2; > - planar_offset[1] = bytesperline_y * height; > - planar_offset[2] = planar_offset[1] + > - bytesperline_c * height; > break; > default: /* raw */ > dev_dbg(csi_dev->dev, > @@ -522,8 +512,6 @@ static void sun6i_csi_set_window(struct sun6i_csi_device > *csi_dev) bytesperline_y = (sun6i_csi_get_bpp(config->pixelformat) * > config->width) / 8; > bytesperline_c = 0; > - planar_offset[1] = -1; > - planar_offset[2] = -1; > break; > } > > @@ -547,21 +535,6 @@ int sun6i_csi_update_config(struct sun6i_csi_device > *csi_dev, return 0; > } > > -void sun6i_csi_update_buf_addr(struct sun6i_csi_device *csi_dev, > - dma_addr_t addr) > -{ > - regmap_write(csi_dev->regmap, SUN6I_CSI_CH_FIFO0_ADDR_REG, > - SUN6I_CSI_ADDR_VALUE(addr + csi_dev- >planar_offset[0])); > - if (csi_dev->planar_offset[1] != -1) > - regmap_write(csi_dev->regmap, SUN6I_CSI_CH_FIFO1_ADDR_REG, > - SUN6I_CSI_ADDR_VALUE(addr + > - csi_dev- >planar_offset[1])); > - if (csi_dev->planar_offset[2] != -1) > - regmap_write(csi_dev->regmap, SUN6I_CSI_CH_FIFO2_ADDR_REG, > - SUN6I_CSI_ADDR_VALUE(addr + > - csi_dev- >planar_offset[2])); > -} > - > void sun6i_csi_set_stream(struct sun6i_csi_device *csi_dev, bool enable) > { > struct regmap *regmap = csi_dev->regmap; > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h > b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h index > f02656dbfd84..44fc4d486877 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h > @@ -62,8 +62,6 @@ struct sun6i_csi_device { > struct clk *clock_mod; > struct clk *clock_ram; > struct reset_control *reset; > - > - int planar_offset[3]; > }; > > struct sun6i_csi_variant { > @@ -94,14 +92,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, > bool enable); int sun6i_csi_update_config(struct sun6i_csi_device *csi_dev, > struct sun6i_csi_config *config); > > -/** > - * sun6i_csi_update_buf_addr() - update the csi frame buffer address > - * @csi: pointer to the csi > - * @addr: frame buffer's physical address > - */ > -void sun6i_csi_update_buf_addr(struct sun6i_csi_device *csi_dev, > - dma_addr_t addr); > - > /** > * sun6i_csi_set_stream() - start/stop csi streaming > * @csi: pointer to the csi > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c > b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c index > acbd0ea62fd5..7788cbab7810 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c > @@ -6,6 +6,7 @@ > */ > > #include > +#include > > #include > #include > @@ -16,6 +17,7 @@ > > #include "sun6i_csi.h" > #include "sun6i_csi_capture.h" > +#include "sun6i_csi_reg.h" > > /* This is got from BSP sources. */ > #define MIN_WIDTH (32) > @@ -109,13 +111,41 @@ static void > sun6i_csi_capture_buffer_configure(struct sun6i_csi_device *csi_dev, > struct sun6i_csi_buffer *csi_buffer) > { > + struct regmap *regmap = csi_dev->regmap; > + const struct v4l2_format_info *info; > struct vb2_buffer *vb2_buffer; > + unsigned int width, height; > dma_addr_t address; > + u32 pixelformat; > > vb2_buffer = &csi_buffer->v4l2_buffer.vb2_buf; > address = vb2_dma_contig_plane_dma_addr(vb2_buffer, 0); > > - sun6i_csi_update_buf_addr(csi_dev, address); > + regmap_write(regmap, SUN6I_CSI_CH_FIFO0_ADDR_REG, > + SUN6I_CSI_ADDR_VALUE(address)); > + > + sun6i_csi_capture_dimensions(csi_dev, &width, &height); > + sun6i_csi_capture_format(csi_dev, &pixelformat, NULL); > + > + info = v4l2_format_info(pixelformat); > + /* Unsupported formats are single-plane, so we can stop here. */ > + if (!info) > + return; > + > + if (info->comp_planes > 1) { > + address += info->bpp[0] * width * height; > + > + regmap_write(regmap, SUN6I_CSI_CH_FIFO1_ADDR_REG, > + SUN6I_CSI_ADDR_VALUE(address)); > + } > + > + if (info->comp_planes > 2) { > + address += info->bpp[1] * DIV_ROUND_UP(width, info- >hdiv) * > + DIV_ROUND_UP(height, info->vdiv); > + > + regmap_write(regmap, SUN6I_CSI_CH_FIFO2_ADDR_REG, > + SUN6I_CSI_ADDR_VALUE(address)); > + } > } > > static void sun6i_csi_capture_configure(struct sun6i_csi_device *csi_dev) From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7CB59C433F5 for ; Wed, 27 Apr 2022 19:17:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NseJkgklkyKQopcU1dLQNmRqYK68AUJRj4icyPTli5M=; b=s3ApFygMVo8MsB WBNa+pF0SMRAr96ov3ag+8vuSJq4iObL3I8biTg7Zn85ePOMtBwVWzdwaa3CDgaU7vM/hwMS0b7Un vj7zXxL2X5mR2TjOUCSE7rIBC5aFWSOvSUKmGfLgYYfk4VjaHGgKaIJoAF9aLJqDZtb4VTXGms9iI VK9zo0tDGgxqlJB7426471+2DTJw6gRUxRKYOEMGrGdNEbG+MIWXJ9u0IDM8xiyhFG/gTGL0DqvUA 9FIWxHi7tkKTUe/50GMB1bIhSrgh/ga/GeiUgAMOR0J48qd2YgKlX3izzN6pTS6c/sY190FV/8xlC ds5SZxmnDdjC0Xx23q6Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1njn9F-003FgZ-D4; Wed, 27 Apr 2022 19:16:25 +0000 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1njn9C-003FfR-91 for linux-arm-kernel@lists.infradead.org; Wed, 27 Apr 2022 19:16:23 +0000 Received: by mail-ed1-x52f.google.com with SMTP id y21so3084254edo.2 for ; Wed, 27 Apr 2022 12:16:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hLJNnGvrtFAOmeWj5ZA0YmApkwdPTHpKx7WHp64IaXc=; b=BoaCeMQf2eJz88iZi8aPpusPSKfMdOwUxqV+E7OG7lHaoEa8LCQRN73oHJYeY4aSB2 VGeJHCUzQVNLlNLTt+8QM9NlL4GOlzEZP8HH265LD/MVHCmGrcZNii5fb+RWwVKeJZG9 CxyfyJZLMZ92m2h7eTIYr2aJBqp0X3RR+b95kGQks5dIQaFw3ClbFFUbQcJBcxPDJkgK 0MFA2S2N3hNwUK0wqQfIFowWTMZL+aJ0qMonkt5RFCrywZASeZ5WEAVLZpAYBlAGg/c8 Kmiy4YI211AbCaRxK6fx1V4vP9MqC+Z8sz0RFHfoilS0JWq58Nv5IubOlF53A9cTT2dD ccDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hLJNnGvrtFAOmeWj5ZA0YmApkwdPTHpKx7WHp64IaXc=; b=pUv0xIGZoSI4TYNtpdaA+gEvhZxrvfN7u4Dm23OrCKUGPs662Ag02bf1N1KTQxTJdc iI5YR0VIUuNgQXE0Gn//DNEO3RKZklmVfnIGs3XL9s3M9XLh9zPMUpEaLH8g2Fpem3XT gkGKIpXas6PyhUCSLOKIzJMD88b/Jchb+37zpFCPl5kxdCfrQbggEamriEcuNwOzlzas /yELZMXklkd+YP2wThi2fhOv4SjAsgvSJw0ioorr85e9VuFNmViAeHwabhM+Gd035GS9 Dp0ekCxexGzAScF0JaLoTHm4KxPQeTVK5Qq4nBaEL7kI1suxrshInKlRxaEml/SgpTJU TTpQ== X-Gm-Message-State: AOAM531nKcrEeJNrmE+dbLFFARefJhXDeNBNJQIj3qj0pR3hvNd4G+xv 6A6mUvQvuSATDVF+Q8SkHu8IZeCQ91u43w== X-Google-Smtp-Source: ABdhPJxqRqhCCImvZlg7ccRWir1+Asr7VdaNmzUyAraKohzOQR2qiTN2ZHRF78lYLEWMpStyZQGOPQ== X-Received: by 2002:aa7:c70f:0:b0:425:f70d:b34 with SMTP id i15-20020aa7c70f000000b00425f70d0b34mr13637098edq.306.1651086978704; Wed, 27 Apr 2022 12:16:18 -0700 (PDT) Received: from jernej-laptop.localnet (89-212-118-115.static.t-2.net. [89.212.118.115]) by smtp.gmail.com with ESMTPSA id r2-20020aa7c142000000b0042617ba63c5sm58674edp.79.2022.04.27.12.16.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 12:16:18 -0700 (PDT) From: Jernej =?utf-8?B?xaBrcmFiZWM=?= To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, Paul Kocialkowski Cc: Yong Deng , Paul Kocialkowski , Mauro Carvalho Chehab , Chen-Yu Tsai , Samuel Holland , Laurent Pinchart , Maxime Ripard , Thomas Petazzoni Subject: Re: [PATCH v4 21/45] media: sun6i-csi: Implement address configuration without indirection Date: Wed, 27 Apr 2022 21:16:17 +0200 Message-ID: <21443501.EfDdHjke4D@jernej-laptop> In-Reply-To: <20220415152811.636419-22-paul.kocialkowski@bootlin.com> References: <20220415152811.636419-1-paul.kocialkowski@bootlin.com> <20220415152811.636419-22-paul.kocialkowski@bootlin.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220427_121622_365686_F0C1B08D X-CRM114-Status: GOOD ( 24.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Dne petek, 15. april 2022 ob 17:27:47 CEST je Paul Kocialkowski napisal(a): > Instead of calculating the planar_offset at one point and using it > later in a dedicated function, reimplement address configuration > with v4l2 format info in the buffer_configure function. > > Signed-off-by: Paul Kocialkowski Acked-by: Jernej Skrabec Best regards, Jernej > --- > .../platform/sunxi/sun6i-csi/sun6i_csi.c | 27 ---------------- > .../platform/sunxi/sun6i-csi/sun6i_csi.h | 10 ------ > .../sunxi/sun6i-csi/sun6i_csi_capture.c | 32 ++++++++++++++++++- > 3 files changed, 31 insertions(+), 38 deletions(-) > > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c index > c7b53e8099d3..98133c1dbf68 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > @@ -463,7 +463,6 @@ static void sun6i_csi_set_window(struct sun6i_csi_device > *csi_dev) struct sun6i_csi_config *config = &csi_dev->config; > u32 bytesperline_y; > u32 bytesperline_c; > - int *planar_offset = csi_dev->planar_offset; > u32 width = config->width; > u32 height = config->height; > u32 hor_len = width; > @@ -488,7 +487,6 @@ static void sun6i_csi_set_window(struct sun6i_csi_device > *csi_dev) SUN6I_CSI_CH_VSIZE_LEN(height) | > SUN6I_CSI_CH_VSIZE_START(0)); > > - planar_offset[0] = 0; > switch (config->pixelformat) { > case V4L2_PIX_FMT_NV12_16L16: > case V4L2_PIX_FMT_NV12: > @@ -497,23 +495,15 @@ static void sun6i_csi_set_window(struct > sun6i_csi_device *csi_dev) case V4L2_PIX_FMT_NV61: > bytesperline_y = width; > bytesperline_c = width; > - planar_offset[1] = bytesperline_y * height; > - planar_offset[2] = -1; > break; > case V4L2_PIX_FMT_YUV420: > case V4L2_PIX_FMT_YVU420: > bytesperline_y = width; > bytesperline_c = width / 2; > - planar_offset[1] = bytesperline_y * height; > - planar_offset[2] = planar_offset[1] + > - bytesperline_c * height / 2; > break; > case V4L2_PIX_FMT_YUV422P: > bytesperline_y = width; > bytesperline_c = width / 2; > - planar_offset[1] = bytesperline_y * height; > - planar_offset[2] = planar_offset[1] + > - bytesperline_c * height; > break; > default: /* raw */ > dev_dbg(csi_dev->dev, > @@ -522,8 +512,6 @@ static void sun6i_csi_set_window(struct sun6i_csi_device > *csi_dev) bytesperline_y = (sun6i_csi_get_bpp(config->pixelformat) * > config->width) / 8; > bytesperline_c = 0; > - planar_offset[1] = -1; > - planar_offset[2] = -1; > break; > } > > @@ -547,21 +535,6 @@ int sun6i_csi_update_config(struct sun6i_csi_device > *csi_dev, return 0; > } > > -void sun6i_csi_update_buf_addr(struct sun6i_csi_device *csi_dev, > - dma_addr_t addr) > -{ > - regmap_write(csi_dev->regmap, SUN6I_CSI_CH_FIFO0_ADDR_REG, > - SUN6I_CSI_ADDR_VALUE(addr + csi_dev- >planar_offset[0])); > - if (csi_dev->planar_offset[1] != -1) > - regmap_write(csi_dev->regmap, SUN6I_CSI_CH_FIFO1_ADDR_REG, > - SUN6I_CSI_ADDR_VALUE(addr + > - csi_dev- >planar_offset[1])); > - if (csi_dev->planar_offset[2] != -1) > - regmap_write(csi_dev->regmap, SUN6I_CSI_CH_FIFO2_ADDR_REG, > - SUN6I_CSI_ADDR_VALUE(addr + > - csi_dev- >planar_offset[2])); > -} > - > void sun6i_csi_set_stream(struct sun6i_csi_device *csi_dev, bool enable) > { > struct regmap *regmap = csi_dev->regmap; > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h > b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h index > f02656dbfd84..44fc4d486877 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h > @@ -62,8 +62,6 @@ struct sun6i_csi_device { > struct clk *clock_mod; > struct clk *clock_ram; > struct reset_control *reset; > - > - int planar_offset[3]; > }; > > struct sun6i_csi_variant { > @@ -94,14 +92,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, > bool enable); int sun6i_csi_update_config(struct sun6i_csi_device *csi_dev, > struct sun6i_csi_config *config); > > -/** > - * sun6i_csi_update_buf_addr() - update the csi frame buffer address > - * @csi: pointer to the csi > - * @addr: frame buffer's physical address > - */ > -void sun6i_csi_update_buf_addr(struct sun6i_csi_device *csi_dev, > - dma_addr_t addr); > - > /** > * sun6i_csi_set_stream() - start/stop csi streaming > * @csi: pointer to the csi > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c > b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c index > acbd0ea62fd5..7788cbab7810 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c > @@ -6,6 +6,7 @@ > */ > > #include > +#include > > #include > #include > @@ -16,6 +17,7 @@ > > #include "sun6i_csi.h" > #include "sun6i_csi_capture.h" > +#include "sun6i_csi_reg.h" > > /* This is got from BSP sources. */ > #define MIN_WIDTH (32) > @@ -109,13 +111,41 @@ static void > sun6i_csi_capture_buffer_configure(struct sun6i_csi_device *csi_dev, > struct sun6i_csi_buffer *csi_buffer) > { > + struct regmap *regmap = csi_dev->regmap; > + const struct v4l2_format_info *info; > struct vb2_buffer *vb2_buffer; > + unsigned int width, height; > dma_addr_t address; > + u32 pixelformat; > > vb2_buffer = &csi_buffer->v4l2_buffer.vb2_buf; > address = vb2_dma_contig_plane_dma_addr(vb2_buffer, 0); > > - sun6i_csi_update_buf_addr(csi_dev, address); > + regmap_write(regmap, SUN6I_CSI_CH_FIFO0_ADDR_REG, > + SUN6I_CSI_ADDR_VALUE(address)); > + > + sun6i_csi_capture_dimensions(csi_dev, &width, &height); > + sun6i_csi_capture_format(csi_dev, &pixelformat, NULL); > + > + info = v4l2_format_info(pixelformat); > + /* Unsupported formats are single-plane, so we can stop here. */ > + if (!info) > + return; > + > + if (info->comp_planes > 1) { > + address += info->bpp[0] * width * height; > + > + regmap_write(regmap, SUN6I_CSI_CH_FIFO1_ADDR_REG, > + SUN6I_CSI_ADDR_VALUE(address)); > + } > + > + if (info->comp_planes > 2) { > + address += info->bpp[1] * DIV_ROUND_UP(width, info- >hdiv) * > + DIV_ROUND_UP(height, info->vdiv); > + > + regmap_write(regmap, SUN6I_CSI_CH_FIFO2_ADDR_REG, > + SUN6I_CSI_ADDR_VALUE(address)); > + } > } > > static void sun6i_csi_capture_configure(struct sun6i_csi_device *csi_dev) _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel