From patchwork Tue Jan 5 15:28:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 11999411 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=-18.8 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,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 2DBAFC43381 for ; Tue, 5 Jan 2021 15:36:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0BAFC22B45 for ; Tue, 5 Jan 2021 15:36:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727981AbhAEPgF (ORCPT ); Tue, 5 Jan 2021 10:36:05 -0500 Received: from perceval.ideasonboard.com ([213.167.242.64]:38168 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725868AbhAEPgF (ORCPT ); Tue, 5 Jan 2021 10:36:05 -0500 Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 8D59B1B0B; Tue, 5 Jan 2021 16:30:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1609860602; bh=aUx6NkHx3MQXTEOmKJP8p52LyQUNXnrbtBHVzil+IiI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eeO0QmUbeE5FYRJJjxE3rIgzoaglCZh2UoNNuRWoN47GIzMGnSB6JM3jN4PUB8A3c HBVEhQStOh3yvoqbnS35zoFdG98uWUCbfEGYl8WBUSTbwRoXmIiL0zkP7yswbQeqD2 VKIwwDYml6pqLagC6UAEg7NtLO4Ylvazk/SWc8wA= From: Laurent Pinchart To: linux-media@vger.kernel.org Cc: Rui Miguel Silva , Steve Longerbeam , Philipp Zabel , Ezequiel Garcia Subject: [PATCH 41/75] media: imx: imx7-media-csi: Move CSI configuration before source start Date: Tue, 5 Jan 2021 17:28:18 +0200 Message-Id: <20210105152852.5733-42-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210105152852.5733-1-laurent.pinchart@ideasonboard.com> References: <20210105152852.5733-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 --- 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 b7e4d83bbbfc..7ff100e895df 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);