Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp3002706yba; Tue, 16 Apr 2019 02:32:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqyAmoBnGVWK1eja0Nrs0rYehOD07RK6ZJ2QwwTXiIX2p/SlitOfMujlM37UHEewKDztnyxw X-Received: by 2002:a63:ed4e:: with SMTP id m14mr76314939pgk.182.1555407148931; Tue, 16 Apr 2019 02:32:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555407148; cv=none; d=google.com; s=arc-20160816; b=XEgeymliMw1GP9Ev2DZwaAVh/0Xd5tW258Myf/1G3ag6GOqXQfw6M7kwUF8u9juI7Y opvlHnM++5AwVPL07YSjNwFoxTf/mFqWORNuOu4hA9IQQ2UBVlIbak+RpElwZVJHUBGt D69DAkgeoIlaAd0doIaFsykRKNqVYzI+ViN+L7sT8ydAjLqQJ9YbiLbCFgy7Ff2k0lLN FD3ZlsPq/+qEWGYXbd80jtrUgRI6tvh7OrI1pvOS5o+ioUEEjbRACT9rNPXlJqYN9D0q oVCJvrBb3d6X5LxrsNgvoePPZ5DsP5OV4tigVpU/bLXaSr7zhLbFWIiWZ7OqQMZA01NZ ggaQ== 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=BGgqvNFUj39xyUdLthDJSP3NxoTgUtjMbjVsJLp/cZg=; b=RFc/8Aq/xbKC98hOVYCyc6R6aLvCQvozRcg2IPqgGSGCh/XbyhfX5MiFVRybTkjf4O fRFPRfSyaJu++DaggQEv5P6NPk9M0Ea3dtsCqs0xu6EugM0YfW/EV4COdmPrUymCLGjy J6A6eiOrWoH6IeMtm2wQEO1aqDk8916YGSXsfPIka/qLhZIXfmZbYr2iXuV7CtqcLAdY dsiZA+0WDlM6rwx28dC71xeqbUUcrPrV9miM3nqbpbxYxD4NFPqQhWlf8zsXUmwWiVEt VJnMN5i23hgZV5VFpZCe7Tz3I5SsEHfkz0NBSK4wK4dhB5vGsJ4bNUiSmde1XIA0AXl/ fzIQ== 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 e5si47298363pls.29.2019.04.16.02.32.12; Tue, 16 Apr 2019 02:32:28 -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 S1728742AbfDPJ1y (ORCPT + 99 others); Tue, 16 Apr 2019 05:27:54 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:37247 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728328AbfDPJ1x (ORCPT ); Tue, 16 Apr 2019 05:27:53 -0400 X-UUID: afec0fad665e471d91357db5b8e1a8a4-20190416 X-UUID: afec0fad665e471d91357db5b8e1a8a4-20190416 Received: from mtkcas09.mediatek.inc [(172.21.101.178)] by mailgw01.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 1376059476; Tue, 16 Apr 2019 17:27:49 +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, 16 Apr 2019 17:27:48 +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, 16 Apr 2019 17:27:48 +0800 From: Stu Hsieh To: Mauro Carvalho Chehab , Rob Herring , CK Hu CC: Mark Rutland , Matthias Brugger , Stu Hsieh , , , , , , Subject: [PATCH v2 11/15] [media] mtk-mipicsi: set the output address in HW reg Date: Tue, 16 Apr 2019 17:27:39 +0800 Message-ID: <1555406863-18069-12-git-send-email-stu.hsieh@mediatek.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1555406863-18069-1-git-send-email-stu.hsieh@mediatek.com> References: <1555406863-18069-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 3624186206bd..4027ed9c94f3 100644 --- a/drivers/media/platform/mtk-mipicsi/mtk_mipicsi.c +++ b/drivers/media/platform/mtk-mipicsi/mtk_mipicsi.c @@ -109,6 +109,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 @@ -516,12 +517,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), @@ -530,6 +541,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); } @@ -961,6 +986,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; @@ -983,6 +1012,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