Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp6003246yba; Mon, 13 May 2019 23:18:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqxaRkfdFetYxg9vHdgezVc4BGLgLe+8jhSawGPbTnhomUhUUMvN5g2bi4kthUfjujQq5ypR X-Received: by 2002:a17:902:d892:: with SMTP id b18mr36412054plz.209.1557814687240; Mon, 13 May 2019 23:18:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557814687; cv=none; d=google.com; s=arc-20160816; b=dLljn8HCb3U3X/C/Ms1f3Eeku4LdHOaqKxPnwMyn4ig3CMK0L1m2EjEiYP2XqnPxUj 74LzSIE0jid7AL/ppezaX1oFgHClsjbeTXm9q+3C+qh2wpF+vdlJOBO9U/ZnJB37OaGN oyFpPtQqlKKZOtRNowhRMFHbIuUnWYD1t70Z9TGEeEOWHYhlUSIrO/CO1pUccGVp/agY WgZdzOQGeiY4F+3oU5PrCC4LL6pDxI2lARXyzc7u4KxW/HZhHp8EVxcA2kYtZEKyY1NQ H0K3Ww6GJ7keOHBDwxBd640MxUuncaF4QtawuuL32dKt4mKod1E16klYLl7vcnufal5/ eBIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=NE4sBjAgpjuoC3Ny+XAfcYDDVsyjmvoSEFlTgdIJJ1Y=; b=0hPOMS8HHFINl88qD27yIM+M9j+kon3f7RmIRbyTbuXRXwcpnN63O5yCI9UeN/41uv WKBpSL3BN3Xf3mPCSvzNsD+axMPCmcRzpz27w+byOxjPefan4K6SEsXApZiqrPK8gNxe fsYd1dhY3VyArNI2y6tAp+i43+7xuGbpQmDg9NxJjYJ8SU+gwENHOJXoXgVb9YN2UOvs UIY48cTOe8ogCsB2spB5phO8aSIrnUgKvGnryrjE6c6p2TJcww7OP9Ey3J7a0eW9GLnO oC4d0hjQEmUQc9Alm16wfgdbI6ce4ncgbqjx9A0B6N7eEjrfHeH/ZPaLujNCKetpqnaN iqpQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a17si8938062pfa.108.2019.05.13.23.17.51; Mon, 13 May 2019 23:18:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726813AbfENGPW (ORCPT + 99 others); Tue, 14 May 2019 02:15:22 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:16842 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726347AbfENGOH (ORCPT ); Tue, 14 May 2019 02:14:07 -0400 X-UUID: 31563ad590f64cd3a9adb8a36aec06ad-20190514 X-UUID: 31563ad590f64cd3a9adb8a36aec06ad-20190514 Received: from mtkexhb01.mediatek.inc [(172.21.101.102)] by mailgw02.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 678261910; Tue, 14 May 2019 14:13:56 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 14 May 2019 14:13:55 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Tue, 14 May 2019 14:13:55 +0800 From: Stu Hsieh To: Mauro Carvalho Chehab , Rob Herring , CK Hu CC: Mark Rutland , Matthias Brugger , Stu Hsieh , , , , , , Subject: [PATCH v3 10/13] [media] mtk-mipicsi: set the output address in HW reg Date: Tue, 14 May 2019 14:13:47 +0800 Message-ID: <1557814430-9675-11-git-send-email-stu.hsieh@mediatek.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1557814430-9675-1-git-send-email-stu.hsieh@mediatek.com> References: <1557814430-9675-1-git-send-email-stu.hsieh@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch set the output address in HW reg when buffer queue and ISR. Signed-off-by: Stu Hsieh --- .../media/platform/mtk-mipicsi/mtk_mipicsi.c | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/drivers/media/platform/mtk-mipicsi/mtk_mipicsi.c b/drivers/media/platform/mtk-mipicsi/mtk_mipicsi.c index af5655345754..cf46fcd01a19 100644 --- a/drivers/media/platform/mtk-mipicsi/mtk_mipicsi.c +++ b/drivers/media/platform/mtk-mipicsi/mtk_mipicsi.c @@ -105,6 +105,7 @@ #define CAMSV_TG_SEN_GRAB_LIN 0x50C #define CAMSV_TG_PATH_CFG 0x510 +#define IMGO_BASE_ADDR 0x220 #define IMGO_XSIZE 0x230 #define IMGO_YSIZE 0x234 #define IMGO_STRIDE 0x238 @@ -503,12 +504,22 @@ static int mtk_mipicsi_vb2_prepare(struct vb2_buffer *vb) return 0; } +static void mtk_mipicsi_fill_buffer(void __iomem *base, dma_addr_t dma_handle) +{ + writel(dma_handle, base + IMGO_BASE_ADDR); +} + static void mtk_mipicsi_vb2_queue(struct vb2_buffer *vb) { struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue); struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct mtk_mipicsi_dev *mipicsi = ici->priv; + unsigned int i = 0; + u64 offset = 0; + u8 link_index = 0U; char *va = NULL; + u32 bytesperline = mipicsi->bytesperline; + u32 height = mipicsi->height; spin_lock(&mipicsi->queue_lock); list_add_tail(&(mipicsi->cam_buf[vb->index].queue), @@ -517,6 +528,20 @@ static void mtk_mipicsi_vb2_queue(struct vb2_buffer *vb) va = vb2_plane_vaddr(vb, 0); + for (i = 0U; (mipicsi->enqueue_cnt == 0UL) && (i < MTK_CAMDMA_MAX_NUM); + ++i) + if (((mipicsi->link_reg_val >> i) & 0x01U) == 0x01U) { + offset = (u64)link_index * bytesperline * height; + + spin_lock(&mipicsi->lock); + mtk_mipicsi_fill_buffer(mipicsi->camsv[i], + mipicsi->cam_buf[vb->index].vb_dma_addr_phy + + offset); + spin_unlock(&mipicsi->lock); + + link_index++; + } + ++(mipicsi->enqueue_cnt); } @@ -938,6 +963,10 @@ static void mtk_mipicsi_irq_buf_process(struct mtk_mipicsi_dev *mipicsi) struct mtk_mipicsi_buf *tmp = NULL; unsigned int index = 0U; unsigned int next = 0U; + u64 offset = 0ULL; + u8 link_index = 0U; + void __iomem *base = NULL; + dma_addr_t pa; for (i = 0U; i < MTK_CAMDMA_MAX_NUM; ++i) mipicsi->irq_status[i] = false; @@ -960,6 +989,16 @@ static void mtk_mipicsi_irq_buf_process(struct mtk_mipicsi_dev *mipicsi) ++i; } + for (i = 0U; i < MTK_CAMDMA_MAX_NUM; ++i) { + if (((mipicsi->link_reg_val >> i) & 0x01U) == 0x01U) { + offset = (u64)link_index * + mipicsi->bytesperline * mipicsi->height; + base = mipicsi->camsv[i]; + pa = mipicsi->cam_buf[next].vb_dma_addr_phy; + mtk_mipicsi_fill_buffer(base, pa + offset); + link_index++; + } + } /* * fb_list has one more buffer. Free the first buffer to user * and fill the second buffer to HW. -- 2.18.0