From patchwork Mon Feb 15 04:27:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 12087681 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=-16.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=ham 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 27310C433DB for ; Mon, 15 Feb 2021 04:36:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EB1B664E61 for ; Mon, 15 Feb 2021 04:36:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229899AbhBOEgL (ORCPT ); Sun, 14 Feb 2021 23:36:11 -0500 Received: from perceval.ideasonboard.com ([213.167.242.64]:45928 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229931AbhBOEgK (ORCPT ); Sun, 14 Feb 2021 23:36:10 -0500 Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 32B071AB8; Mon, 15 Feb 2021 05:28:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1613363323; bh=+E8cDKHY5O8tCaiVHrMjhQ7kB3d/2NVBCAhNsY6PrOg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bF2I2n/86kiY3DkCy/kxZitILNv3KbKOXw+PO7rky+SaCl+cEIphopw8QF4w1eBgq Tn77ncfppbljNgC1wQC3R32gdmeZcWEZnyniC7xirQwRY/3c3dH4WkEgOz/S0Cf20E G5whz+H3O7jDpztC1l3Yk3x66dk0jOt990Xhjz7o= From: Laurent Pinchart To: linux-media@vger.kernel.org Cc: Rui Miguel Silva , Steve Longerbeam , Philipp Zabel , Ezequiel Garcia , Fabio Estevam Subject: [PATCH v2 42/77] media: imx: imx7-media-csi: Move CSI configuration before source start Date: Mon, 15 Feb 2021 06:27:06 +0200 Message-Id: <20210215042741.28850-43-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210215042741.28850-1-laurent.pinchart@ideasonboard.com> References: <20210215042741.28850-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org There's no reason to delay the CSI configuration and the DMA setup after starting the source. Move it before, simplifying error handling at stream start. Signed-off-by: Laurent Pinchart Reviewed-by: Rui Miguel Silva --- drivers/staging/media/imx/imx7-media-csi.c | 27 ++++++++-------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c index 9cb04fa31b5a..f6a26dff8541 100644 --- a/drivers/staging/media/imx/imx7-media-csi.c +++ b/drivers/staging/media/imx/imx7-media-csi.c @@ -577,15 +577,23 @@ static int imx7_csi_init(struct imx7_csi *csi) ret = clk_prepare_enable(csi->mclk); if (ret < 0) return ret; + imx7_csi_hw_reset(csi); imx7_csi_init_interface(csi); imx7_csi_dmareq_rff_enable(csi); + ret = imx7_csi_dma_setup(csi); + if (ret < 0) + return ret; + + imx7_csi_configure(csi); + return 0; } static void imx7_csi_deinit(struct imx7_csi *csi) { + imx7_csi_dma_cleanup(csi); imx7_csi_hw_reset(csi); imx7_csi_init_interface(csi); imx7_csi_dmareq_rff_disable(csi); @@ -612,24 +620,14 @@ static void imx7_csi_disable(struct imx7_csi *csi) imx7_csi_hw_disable(csi); } -static int imx7_csi_streaming_start(struct imx7_csi *csi) +static void imx7_csi_streaming_start(struct imx7_csi *csi) { - int ret; - - ret = imx7_csi_dma_setup(csi); - if (ret < 0) - return ret; - - imx7_csi_configure(csi); imx7_csi_enable(csi); - - return 0; } static int imx7_csi_streaming_stop(struct imx7_csi *csi) { imx7_csi_dma_stop(csi); - imx7_csi_dma_cleanup(csi); imx7_csi_disable(csi); @@ -769,12 +767,7 @@ static int imx7_csi_s_stream(struct v4l2_subdev *sd, int enable) goto out_unlock; } - ret = imx7_csi_streaming_start(csi); - if (ret < 0) { - v4l2_subdev_call(csi->src_sd, video, s_stream, 0); - imx7_csi_deinit(csi); - goto out_unlock; - } + imx7_csi_streaming_start(csi); } else { imx7_csi_streaming_stop(csi);