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 X-Spam-Level: X-Spam-Status: No, score=-5.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93D22C432C0 for ; Fri, 29 Nov 2019 16:56:03 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 5F0D4215A5 for ; Fri, 29 Nov 2019 16:56:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LazMQgCt"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="MXX0+hWb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5F0D4215A5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=gCMKa+lTXToBJjtuMAU3SmWyanBx9LVqGYOjZchHtYg=; b=LazMQgCt+xOVIm JwWoKMXVYFJ1ORQkmfv9etcJlGTmsQh0fxy9X7pyKCEI5QLrgBQurz78uGeFpjXrv4QsjRIdvN4iE wN/XPfgZJt9q25YmPPkw1j8vw3ySXxChoFPXKM0t1N+g1pUDzRxG8s2BhWkuuNvUrGBeh3guU0pg+ qLg1ax39aSr1RvhxrlseeO+LBH0o/OBIUI/rUkGSVT67A3m9ILXCGLSs9vHGz3IL4556LZCCCDIeF z6sxPNVn0v2wm4E+VbXrCPuR1e8Kl1A7yCtr2W61+KKj+gB4nMN7no3Fgxo8Dw4L+CTPh5kB4dkfi YfnuVIYeLXMjuqNP75qg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iajYo-0002oO-H1; Fri, 29 Nov 2019 16:56:02 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iajYe-0002gM-K0; Fri, 29 Nov 2019 16:55:54 +0000 X-UUID: c3e83212055b44f9b0d1833a2632aa4d-20191129 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=RwPIBCt8Byv35g9Lc2rnuZU0pdZStU8upoyg76kEMY4=; b=MXX0+hWbQ23oktIZa8XNLebbhUkm7YlR0W8iVJCXosD/tcNg/q2TAd0G/cLfQ3i0oV6QERKtvXR6jFfJrK0jiYiDd8QR0jARN1R10uP7lhm2xLbacl1eNGSlFpFNn7wIZj2OhkWur5TKELO/pubyO/pQqQscpqb2yyT+xIJR0bo=; X-UUID: c3e83212055b44f9b0d1833a2632aa4d-20191129 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 488550083; Fri, 29 Nov 2019 08:55:07 -0800 Received: from MTKMBS01N2.mediatek.inc (172.21.101.79) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 29 Nov 2019 08:56:19 -0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs01n2.mediatek.inc (172.21.101.79) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Sat, 30 Nov 2019 00:55:27 +0800 Received: from [172.21.84.99] (172.21.84.99) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Sat, 30 Nov 2019 00:55:32 +0800 Message-ID: <1575046535.22859.12.camel@mtksdccf07> Subject: Re: [RFC PATCH V3 3/3] platform: mtk-isp: Add Mediatek FD driver From: Jerry-ch Chen To: Tomasz Figa Date: Sat, 30 Nov 2019 00:55:35 +0800 In-Reply-To: References: <20190906101125.3784-1-Jerry-Ch.chen@mediatek.com> <20190906101125.3784-4-Jerry-Ch.chen@mediatek.com> <1571109375.3706.40.camel@mtksdccf07> <20191025035211.GA67000@chromium.org> <1574237450.20087.17.camel@mtksdccf07> X-Mailer: Evolution 3.2.3-0ubuntu6 MIME-Version: 1.0 X-TM-SNTS-SMTP: D51109AE6E671CDAFBA4AA9F40A1052B9EF5BBB8763216FD60DE4E9BA0F9AFD22000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191129_085552_672024_05252E76 X-CRM114-Status: GOOD ( 34.31 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "devicetree@vger.kernel.org" , Sean Cheng =?UTF-8?Q?=28=E9=84=AD=E6=98=87=E5=BC=98=29?= , Frederic Chen =?UTF-8?Q?=28=E9=99=B3=E4=BF=8A=E5=85=83=29?= , Rynn Wu =?UTF-8?Q?=28=E5=90=B3=E8=82=B2=E6=81=A9=29?= , Christie Yu =?UTF-8?Q?=28=E6=B8=B8=E9=9B=85=E6=83=A0=29?= , srv_heupstream , Jungo Lin =?UTF-8?Q?=28=E6=9E=97=E6=98=8E=E4=BF=8A=29?= , Po-Yang Huang =?UTF-8?Q?=28=E9=BB=83=E6=9F=8F=E9=99=BD=29?= , CK Hu =?UTF-8?Q?=28=E8=83=A1=E4=BF=8A=E5=85=89=29?= , Sj Huang =?UTF-8?Q?=28=E9=BB=83=E4=BF=A1=E7=92=8B=29?= , "yuzhao@chromium.org" , "lkml@metux.net" , "zwisler@chromium.org" , "hans.verkuil@cisco.com" , "matthias.bgg@gmail.com" , "linux-mediatek@lists.infradead.org" , "mchehab@kernel.org" , "laurent.pinchart+renesas@ideasonboard.com" , "linux-arm-kernel@lists.infradead.org" , "linux-media@vger.kernel.org" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Hi Tomasz, On Wed, 2019-11-20 at 18:28 +0900, Tomasz Figa wrote: > On Wed, Nov 20, 2019 at 5:11 PM Jerry-ch Chen > wrote: > > > > Hi Tomasz, > > > > On Fri, 2019-10-25 at 11:52 +0800, Tomasz Figa wrote: > > > On Tue, Oct 15, 2019 at 11:16:15AM +0800, Jerry-ch Chen wrote: > > > > Hi Tomasz, > > > > > > > > On Fri, 2019-09-06 at 18:11 +0800, Jerry-ch Chen wrote: > > > > > From: Jerry-ch Chen > > > > > > > > > > This patch adds the driver of Face Detection (FD) unit in > > > > > Mediatek camera system, providing face detection function. > > > > > > > > > > The mtk-isp directory will contain drivers for multiple IP > > > > > blocks found in Mediatek ISP system. It will include ISP Pass 1 > > > > > driver (CAM), sensor interface driver, DIP driver and face > > > > > detection driver. > > > > > > > > > > Signed-off-by: Jerry-ch Chen > > > > > --- > > > > > drivers/media/platform/Kconfig | 2 + > > > > > drivers/media/platform/Makefile | 2 + > > > > > drivers/media/platform/mtk-isp/fd/Kconfig | 19 + > > > > > drivers/media/platform/mtk-isp/fd/Makefile | 5 + > > > > > drivers/media/platform/mtk-isp/fd/mtk_fd.h | 148 ++ > > > > > drivers/media/platform/mtk-isp/fd/mtk_fd_40.c | 1219 +++++++++++++++++ > > > > > include/uapi/linux/mtk-fd-v4l2-controls.h | 69 + > > > > > include/uapi/linux/v4l2-controls.h | 4 + > > > > > 8 files changed, 1468 insertions(+) > > > > > create mode 100644 drivers/media/platform/mtk-isp/fd/Kconfig > > > > > create mode 100644 drivers/media/platform/mtk-isp/fd/Makefile > > > > > create mode 100644 drivers/media/platform/mtk-isp/fd/mtk_fd.h > > > > > create mode 100644 drivers/media/platform/mtk-isp/fd/mtk_fd_40.c > > > > > create mode 100644 include/uapi/linux/mtk-fd-v4l2-controls.h > > > > > > > > > > > [snip] > > > > > > > > +static int mtk_fd_job_abort(struct mtk_fd_dev *fd) > > > > > +{ > > > > > + u32 ret; > > > > > + > > > > > + ret = wait_for_completion_timeout(&fd->fd_irq_done, > > > > > + msecs_to_jiffies(MTK_FD_HW_TIMEOUT)); > > > > > + /* Reset FD HW */ > > > > > + if (!ret) { > > > > > + struct ipi_message fd_ipi_msg; > > > > > + > > > > > + fd_ipi_msg.cmd_id = MTK_FD_IPI_CMD_RESET; > > > > > + if (scp_ipi_send(fd->scp_pdev, SCP_IPI_FD_CMD, &fd_ipi_msg, > > > > > + sizeof(fd_ipi_msg), MTK_FD_IPI_SEND_TIMEOUT)) > > > > > + dev_err(fd->dev, "FD Reset HW error\n"); > > > > > + return -ETIMEDOUT; > > > > > + } > > > > > + return 0; > > > > > +} > > > > > + > > > > > > > > Continue the discussion about job abort in RFC v2, > > > > > > > > I think the job_abort callback in v4l2_m2m_ops() might be useful. > > > > > > > > ref: > > > > https://elixir.bootlin.com/linux/v5.4-rc2/source/drivers/media/v4l2-core/v4l2-mem2mem.c#L398 > > > > https://elixir.bootlin.com/linux/v5.4-rc2/source/include/media/v4l2-mem2mem.h#L43 > > > > > > > > in drivers/media/v4l2-core/v4l2-mem2mem.c #398 v4l2_m2m_cancel_job() > > > > ... > > > > if (m2m_ctx->job_flags & TRANS_RUNNING) { > > > > spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags); > > > > if (m2m_dev->m2m_ops->job_abort) > > > > m2m_dev->m2m_ops->job_abort(m2m_ctx->priv); > > > > dprintk("m2m_ctx %p running, will wait to complete\n", m2m_ctx); > > > > wait_event(m2m_ctx->finished, > > > > !(m2m_ctx->job_flags & TRANS_RUNNING)); > > > > } ... > > > > > > > > If this operation is set, we might use the v4l2_m2m_cancel_job() when > > > > suspend, and it will do mtk_fd_job_abort() here. > > > > > > > > > > The expectation for .job_abort() is that signals the hardware to > > > instantly abandon the current job. Do we have a way to tell the > > > firmware/hardware to do so? > > > > > > Also, suspend must not abort the current job. Anything that was already > > > running is expected to complete successfuly and further jobs should > > > continue executing once the system resumes. > > > > > I appreciate your comments and Pi-Hsun's patch, > > > > Ok, I see. > > For FD40, we can't tell the firmware/hardware to instantly abandon the > > current job. > > Therefore, for suspend, we stop sending further jobs to hardware and > > wait for the completion of the running job. > > For resume, we continue sending jobs to hardware. > > > > > [snip] > > > > > > > > + > > > > > +static int mtk_fd_suspend(struct device *dev) > > > > > +{ > > > > > + struct mtk_fd_dev *fd = dev_get_drvdata(dev); > > > > > + > > > > > + if (pm_runtime_suspended(dev)) > > > > > + return 0; > > > > > + > > > > > + if (fd->fd_stream_count) > > > > > + if (mtk_fd_job_abort(fd)) > > > > > + mtk_fd_hw_job_finish(fd, VB2_BUF_STATE_ERROR); > > > > > + > > > > > > > > To avoid mtk_fd_hw_job_finish() trigger the next job, > > > > I suppose that we could use v4l2_m2m_cancel_job instead of job_abort and > > > > job_finish here. > > > > > > > > /** > > > > * v4l2_m2m_cancel_job() - cancel pending jobs for the context > > > > * @m2m_ctx: m2m context with jobs to be canceled > > > > * > > > > * In case of streamoff or release called on any context, > > > > * 1] If the context is currently running, then abort job will be called > > > > * 2] If the context is queued, then the context will be removed from > > > > * the job_queue > > > > */ > > > > > > > > or another way, > > > > we may add a flag and implement mtk_fd_job_ready() that reads the flag > > > > if we suspend, we set the flag and do job_abort and job_finish, even if > > > > it try enqueue, it will still not really queue the job, until we reset > > > > the flag in mtk_fd_resume(). > > > > > > > > how do you think? > > > > > > > > > > As per my comment above, suspend must just pause the execution of the > > > jobs. It must not cause any jobs to be skipped. > > > > > > After analyzing the m2m framework and existing m2m drivers I realized > > > that they currently provide no way to correctly handle suspend/resume. > > > Pi-Hsun has been looking into fixing this in crrev.com/c/1878112 and > > > we'll send it upstream as soon as we get something that should handle > > > all the cases correctly. > > > > > Ok, thanks for the patches. > > > > > > > + /* suspend FD HW */ > > > > > + writel(0x0, fd->fd_base + MTK_FD_REG_OFFSET_INT_EN); > > > > > + writel(0x0, fd->fd_base + MTK_FD_REG_OFFSET_HW_ENABLE); > > > > > + clk_disable_unprepare(fd->fd_clk); > > > > > + dev_dbg(dev, "%s:disable clock\n", __func__); > > > > > + > > > > > + return 0; > > > > > +} > > > > > + > > > > > +static int mtk_fd_resume(struct device *dev) > > > > > +{ > > > > > + struct mtk_fd_dev *fd = dev_get_drvdata(dev); > > > > > + int ret; > > > > > + > > > > > + if (pm_runtime_suspended(dev)) > > > > > + return 0; > > > > > + > > > > > + ret = clk_prepare_enable(fd->fd_clk); > > > > > + if (ret < 0) { > > > > > + dev_dbg(dev, "Failed to open fd clk:%d\n", ret); > > > > > + return ret; > > > > > + } > > > > > + > > > > > + /* resume FD HW */ > > > > > + writel(MTK_FD_SET_HW_ENABLE, fd->fd_base + MTK_FD_REG_OFFSET_HW_ENABLE); > > > > > + writel(0x1, fd->fd_base + MTK_FD_REG_OFFSET_INT_EN); > > > > > + dev_dbg(dev, "%s:enable clock\n", __func__); > > > > > > By the way, we need to kick the m2m framework here to schedule further > > > jobs. Pi-Hsun's patch will also take care of this. > > > > > Ok, I see. > > I would like to use Pi-Hsun's patch, otherwise I would need to call > > v4l2_m2m_try_run() here. > > > > Yes, please include Pi-Hsun's patch (with original author, sign-off + > your sign-off added) at the beginning of the next version of your > series. > Done. > > > [snip] > > > > > > > > +/* Set the face angle and directions to be detected */ > > > > > +#define V4L2_CID_MTK_FD_DETECT_POSE (V4L2_CID_USER_MTK_FD_BASE + 1) > > > > > + > > > > > +/* Set image widths for an input image to be scaled down for face detection */ > > > > > +#define V4L2_CID_MTK_FD_SCALE_DOWN_IMG_WIDTH (V4L2_CID_USER_MTK_FD_BASE + 2) > > > > > + > > > > > +/* Set image heights for an input image to be scaled down for face detection */ > > > > > +#define V4L2_CID_MTK_FD_SCALE_DOWN_IMG_HEIGHT (V4L2_CID_USER_MTK_FD_BASE + 3) > > > > > + > > > > > +/* Set the length of scale down size array */ > > > > > +#define V4L2_CID_MTK_FD_SCALE_IMG_NUM (V4L2_CID_USER_MTK_FD_BASE + 4) > > > > > + > > > > > +/* Set the detection speed, usually reducing accuracy. */ > > > > > +#define V4L2_CID_MTK_FD_DETECT_SPEED (V4L2_CID_USER_MTK_FD_BASE + 5) > > > > > + > > > > > +/* Select the detection model or algorithm to be used. */ > > > > > +#define V4L2_CID_MTK_FD_DETECTION_MODEL (V4L2_CID_USER_MTK_FD_BASE + 6) > > > > > + > > > > > +/* We reserve 16 controls for this driver. */ > > > > > +#define V4L2_CID_MTK_FD_MAX 16 > > > > > + > > > > > > > > For these control IDs, I think the following should be remained as chip > > > > specific controls. > > > > V4L2_CID_MTK_FD_SCALE_DOWN_IMG_WIDTH, > > > > V4L2_CID_MTK_FD_SCALE_DOWN_IMG_HEIGHT and V4L2_CID_MTK_FD_SCALE_IMG_NUM > > > > > > > > Hope there would be standardizing face detection api that cover the rest > > > > controls: V4L2_CID_MTK_FD_DETECT_POSE, V4L2_CID_MTK_FD_DETECT_SPEED and > > > > V4L2_CID_MTK_FD_DETECTION_MODEL > > > > > > > > Would you have any suggestions on how to propose the standard face > > > > detection apis? > > > > > > > > > > Given no follow up feedback from the community, I think we can keep them > > > as driver-specific, but should make sure that they have some reasonable > > > default values in case an application doesn't recognize them. > > > > > > Best regards, > > > Tomasz > > > > > Should I keep the file "mtk-fd-v4l2-controls.h" which defines the > > control ids under the folder "/include/uapi/linux"? > > We should define the CID base for the FD driver in v4l2-controls.h, > but the controls themselves should be only defined inside the driver. > > For example: > https://elixir.bootlin.com/linux/v5.4-rc8/source/include/uapi/linux/v4l2-controls.h#L178 > https://elixir.bootlin.com/linux/v5.4-rc8/source/drivers/media/i2c/adv7180.c#L181 > > Best regards, > Tomasz Appreciate for providing the example, Would it be fine for me to put the private CID in the mtk_fd.h(which is similar to before...) or follow the example to define inside mtk_fd_40.c?? The next version is almost ready, maybe I can send it when I ready in a few days? Thanks and best regards, Jerry _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek