From patchwork Sun Sep 29 13:36:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 13815103 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 600BCCF6495 for ; Sun, 29 Sep 2024 13:39:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=H24heGZOFwke5+du84omb0id4JX0VLJyKIeoEtlCUIY=; b=CNjq7zx78jkY7BdHqceth9Z50I +5EqyQGqmynaUMv8HgnP/PHYEb8+EfH7UVdy7/feI6gNTaDYKquSeXCyZ7ilWKIajHWJvGovDJfH0 Yrp3+5NlH68ZDAB/Yqx7Vu7tjtD8sc+vTptIzBYsPx5mzX7U/3pKJKx/Ih8pA6MpqZXxl83+gwD7V x95w+p5Mxjj4SAJWHLKgnqoAHCsYASwp+MYeiiNsURR4GPvfHCFZbI5JEquaS9molUQYc18ji3qmo 0I6y6XlHxo53H5X79+VKzWK4XVnE2pm+iU/4cI4IBkIunkgaKFzTMAFIGGCw3Hb9SXbWtU04K5pyX qUD1pAIA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1suu8q-0000000EpEP-30ti; Sun, 29 Sep 2024 13:39:16 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1suu6V-0000000EouQ-2qmk for linux-arm-kernel@lists.infradead.org; Sun, 29 Sep 2024 13:36:52 +0000 Received: from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi [81.175.209.231]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 30B8A227; Sun, 29 Sep 2024 15:35:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1727616920; bh=OcwnUVuhMtXnLLH9oEg60Lun1uQvDGaKMD6lqbREbb0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ozIcoAtM2HkBfIVmBPyeQ4Ty0McQdDMf75iwy2vb8YFnugvwHVug1C31Fo1apPKMh 3QBLKfhlWF0xN1FrhPIDpLsVaMH0w9P3OJOtd4DkaT7QOqxbEwDkFFrlfsHShU8q/7 FUwuVOrSfVrRo4o+t6zD/dfzgkb6KnZWSka4ge1I= From: Laurent Pinchart To: Cc: guoniu.zhou@oss.nxp.com, imx@lists.linux.dev, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] media: imx8mq-mipi-csi2: Drop stream stop/restart at suspend/resume time Date: Sun, 29 Sep 2024 16:36:40 +0300 Message-ID: <20240929133646.19991-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240929133646.19991-1-laurent.pinchart@ideasonboard.com> References: <20240929133646.19991-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240929_063651_879931_A99AC7B3 X-CRM114-Status: GOOD ( 11.26 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The imx8mq-mipi-csi2 driver stops streaming at suspend time, and restarts it at resume time, in both the runtime and system suspend/resume handlers. This isn't needed: - The device is runtime resumed only from the .s_stream() handler, before starting streaming, and runtime suspended in the same function, after stopping streaming. - For system suspend/resume, the whole capture pipeline is stopped and restarted in a controlled manner by the top-level driver (the CSI bridge in this case). When the system suspend handler is called, streaming will have been stopped already. Drop stream stop/restart from the PM handlers. Signed-off-by: Laurent Pinchart --- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c index d4a6c5532969..8eb9c7049425 100644 --- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c +++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c @@ -64,7 +64,6 @@ enum { ST_POWERED = 1, - ST_STREAMING = 2, ST_SUSPENDED = 4, }; @@ -420,12 +419,9 @@ static int imx8mq_mipi_csi_s_stream(struct v4l2_subdev *sd, int enable) ret = v4l2_subdev_call(state->src_sd, video, s_stream, 1); if (ret < 0) goto unlock; - - state->state |= ST_STREAMING; } else { v4l2_subdev_call(state->src_sd, video, s_stream, 0); imx8mq_mipi_csi_stop_stream(state); - state->state &= ~ST_STREAMING; } unlock: @@ -668,7 +664,6 @@ static int imx8mq_mipi_csi_pm_resume(struct device *dev) { struct v4l2_subdev *sd = dev_get_drvdata(dev); struct csi_state *state = mipi_sd_to_csi2_state(sd); - struct v4l2_subdev_state *sd_state; int ret = 0; mutex_lock(&state->lock); @@ -677,17 +672,9 @@ static int imx8mq_mipi_csi_pm_resume(struct device *dev) state->state |= ST_POWERED; ret = imx8mq_mipi_csi_clk_enable(state); } - if (state->state & ST_STREAMING) { - sd_state = v4l2_subdev_lock_and_get_active_state(sd); - ret = imx8mq_mipi_csi_start_stream(state, sd_state); - v4l2_subdev_unlock_state(sd_state); - if (ret) - goto unlock; - } state->state &= ~ST_SUSPENDED; -unlock: mutex_unlock(&state->lock); return ret ? -EAGAIN : 0; From patchwork Sun Sep 29 13:36:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 13815112 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 6F452CF6499 for ; Sun, 29 Sep 2024 13:40:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=NB2Fen65XiQw/ftAHOXXAbdH1RHS0sveFsUyfGQ/rtw=; b=qWo8VsjRmLnxZFYKPtIa6B/GaA UQ0O3fVmoexaiIPZfazAqSp9Moj5z275+5TfA8Pe5yWXuHX66rjuUbFC9aUAqdEeUSLnl2/I50CvF zps6BbxRA2Bjj4oDTyETNvailYZlhJuVOAHtn2VR6fWwkHCTo1GHp/LnKHYlvyPswSM8h/BZsQCqL yPSTiQp9ck227IN2nn3Ts0FnG0rUunZ4EX7JoxOQRE3f3v98q4AlxSSQ6nRp/hngi7iPFrzw0tMvl BJar7JdDcVU49BylwZTH/Fqm9Un+v95E5qkNzbYdNvvaq3Rhn997LIXeSfAAjiomVlcWPI+dzOC5M L9A73+CQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1suuA0-0000000EpSV-1wzK; Sun, 29 Sep 2024 13:40:28 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1suu6X-0000000Eouw-03Rw for linux-arm-kernel@lists.infradead.org; Sun, 29 Sep 2024 13:36:54 +0000 Received: from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi [81.175.209.231]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 964486DE; Sun, 29 Sep 2024 15:35:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1727616921; bh=oMfSYlB7P9eLwoLyD1PZzgkE2aC3vO/4RvgIGutTDEI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VA0vNGsWTljhT2+PijnAn9bDQP6Fy7jjAomFTPt8yOjNixZXHcgOUczeokhftQDCD QAxfKbj9VO1XriMdu7cYmGhwtWWDLimX+6GOI3cDmBIiMiLL54NMBSOK0ezQ83Uhk1 Vg6k3AZ/hV/XO/c8pko4+Fg0Rv4gEbitPJ5WtDWQ= From: Laurent Pinchart To: Cc: guoniu.zhou@oss.nxp.com, imx@lists.linux.dev, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] media: imx8mq-mipi-csi2: Drop ST_SUSPENDED guard Date: Sun, 29 Sep 2024 16:36:41 +0300 Message-ID: <20240929133646.19991-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240929133646.19991-1-laurent.pinchart@ideasonboard.com> References: <20240929133646.19991-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240929_063653_223140_2DE15A0B X-CRM114-Status: GOOD ( 11.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The ST_SUSPENDED flag is set at system suspend and cleared at either system resume or runtime resume. It is then used in two locations: - In .s_stream(), when starting the stream to return -EBUSY if the device is suspended. This can't happen, As the function calls pm_runtime_resume_and_get() just before the check, which clears the ST_SUSPENDED flag. - In imx8mq_mipi_csi_resume() to skip resuming if the device isn't suspended. As imx8mq_mipi_csi_resume() is the system resume handler, the device is by definition suspended. The ST_SUSPENDED flag is therefore not needed. Drop it. Signed-off-by: Laurent Pinchart --- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c index 8eb9c7049425..0f56a40abf33 100644 --- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c +++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c @@ -64,7 +64,6 @@ enum { ST_POWERED = 1, - ST_SUSPENDED = 4, }; enum imx8mq_mipi_csi_clk { @@ -404,11 +403,6 @@ static int imx8mq_mipi_csi_s_stream(struct v4l2_subdev *sd, int enable) mutex_lock(&state->lock); if (enable) { - if (state->state & ST_SUSPENDED) { - ret = -EBUSY; - goto unlock; - } - sd_state = v4l2_subdev_lock_and_get_active_state(sd); ret = imx8mq_mipi_csi_start_stream(state, sd_state); v4l2_subdev_unlock_state(sd_state); @@ -673,8 +667,6 @@ static int imx8mq_mipi_csi_pm_resume(struct device *dev) ret = imx8mq_mipi_csi_clk_enable(state); } - state->state &= ~ST_SUSPENDED; - mutex_unlock(&state->lock); return ret ? -EAGAIN : 0; @@ -682,24 +674,13 @@ static int imx8mq_mipi_csi_pm_resume(struct device *dev) static int imx8mq_mipi_csi_suspend(struct device *dev) { - struct v4l2_subdev *sd = dev_get_drvdata(dev); - struct csi_state *state = mipi_sd_to_csi2_state(sd); - imx8mq_mipi_csi_pm_suspend(dev); - state->state |= ST_SUSPENDED; - return 0; } static int imx8mq_mipi_csi_resume(struct device *dev) { - struct v4l2_subdev *sd = dev_get_drvdata(dev); - struct csi_state *state = mipi_sd_to_csi2_state(sd); - - if (!(state->state & ST_SUSPENDED)) - return 0; - return imx8mq_mipi_csi_pm_resume(dev); } From patchwork Sun Sep 29 13:36:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 13815113 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id AD944CF6495 for ; Sun, 29 Sep 2024 13:41:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=lbmon8hBScS2tBRN9wwYEGgaWe3VUrOufoxVfPPpGPw=; b=INm/PsxqJqSucQjuq0AeXgHFmf AdJ7Ng9WRsojZEYIJZdlcZjfnBxxhC1rXzuzisjlNHAkGcF0sDSatjpWMjzXM4/fk6OCDgpSC436G /CQKMleR+3BtpTKQ3rntc4BC+MdgP6aKBDLz26k7a73ePH7NOhKpYVZmNNYfKVugfs/uNjqo7i6B9 UTFOmMiRVOgHuTNEc4nX0HOdJlRIKRop7bIwa0NdjKo15dvnMrMVEHGyPGEZxbYJpcCaOHJaolUCu 1PBMYkvo0L1u95npP9K90ab8IARt5VUTRpJk8asq3iZvnDTVxOdpWwGJyEE8Sxr8eWEJZJUH6J/h+ mCzGrH6g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1suuB9-0000000EpZR-19uH; Sun, 29 Sep 2024 13:41:39 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1suu6Y-0000000EovU-3Jqc for linux-arm-kernel@lists.infradead.org; Sun, 29 Sep 2024 13:36:56 +0000 Received: from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi [81.175.209.231]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 09ABEA98; Sun, 29 Sep 2024 15:35:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1727616923; bh=BJyfg/bYawpzN0ZweGvRjC/Ui3Wm3vXBCxldTdF1wbg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RAEqK46PDeGCHxt3bNDUacZQxVSSZYxtXDNULSH9ogiRWl8F+Wxstu7jRaygvr/pF gDzWaDs7Pv/XkfK+tUb5F/HLlpjo+PfoOYgjDQnT72H0eYbgO8yaQgMUXlVZMNpeKV er7MlV9TJvAw/XQcyCYtRtm3Lo//OLOI1Nd+nN6I= From: Laurent Pinchart To: Cc: guoniu.zhou@oss.nxp.com, imx@lists.linux.dev, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] media: imx8mq-mipi-csi2: Drop system suspend/resume handlers Date: Sun, 29 Sep 2024 16:36:42 +0300 Message-ID: <20240929133646.19991-4-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240929133646.19991-1-laurent.pinchart@ideasonboard.com> References: <20240929133646.19991-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240929_063655_026516_0132DC70 X-CRM114-Status: GOOD ( 15.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Video capture pipelines are suspended and resumes in a controlled manner by the top-level driver (the CSI bridge driver in this case), to ensure proper synchronization of sources and sinks. There is therefore no need for system suspend/resume handlers in the imx8mq-mipi-csi2 driver. Drop them. Signed-off-by: Laurent Pinchart --- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 81 +++---------------- 1 file changed, 10 insertions(+), 71 deletions(-) diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c index 0f56a40abf33..54b2de09692b 100644 --- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c +++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include @@ -62,10 +61,6 @@ #define CSI2RX_CFG_VID_P_FIFO_SEND_LEVEL 0x188 #define CSI2RX_CFG_DISABLE_PAYLOAD_1 0x130 -enum { - ST_POWERED = 1, -}; - enum imx8mq_mipi_csi_clk { CSI2_CLK_CORE, CSI2_CLK_ESC, @@ -116,9 +111,6 @@ struct csi_state { struct v4l2_mbus_config_mipi_csi2 bus; - struct mutex lock; /* Protect state */ - u32 state; - struct regmap *phy_gpr; u8 phy_gpr_reg; @@ -400,27 +392,23 @@ static int imx8mq_mipi_csi_s_stream(struct v4l2_subdev *sd, int enable) return ret; } - mutex_lock(&state->lock); - if (enable) { sd_state = v4l2_subdev_lock_and_get_active_state(sd); ret = imx8mq_mipi_csi_start_stream(state, sd_state); v4l2_subdev_unlock_state(sd_state); if (ret < 0) - goto unlock; + goto out; ret = v4l2_subdev_call(state->src_sd, video, s_stream, 1); if (ret < 0) - goto unlock; + goto out; } else { v4l2_subdev_call(state->src_sd, video, s_stream, 0); imx8mq_mipi_csi_stop_stream(state); } -unlock: - mutex_unlock(&state->lock); - +out: if (!enable || ret < 0) pm_runtime_put(state->dev); @@ -638,59 +626,14 @@ static int imx8mq_mipi_csi_async_register(struct csi_state *state) * Suspend/resume */ -static void imx8mq_mipi_csi_pm_suspend(struct device *dev) -{ - struct v4l2_subdev *sd = dev_get_drvdata(dev); - struct csi_state *state = mipi_sd_to_csi2_state(sd); - - mutex_lock(&state->lock); - - if (state->state & ST_POWERED) { - imx8mq_mipi_csi_stop_stream(state); - imx8mq_mipi_csi_clk_disable(state); - state->state &= ~ST_POWERED; - } - - mutex_unlock(&state->lock); -} - -static int imx8mq_mipi_csi_pm_resume(struct device *dev) -{ - struct v4l2_subdev *sd = dev_get_drvdata(dev); - struct csi_state *state = mipi_sd_to_csi2_state(sd); - int ret = 0; - - mutex_lock(&state->lock); - - if (!(state->state & ST_POWERED)) { - state->state |= ST_POWERED; - ret = imx8mq_mipi_csi_clk_enable(state); - } - - mutex_unlock(&state->lock); - - return ret ? -EAGAIN : 0; -} - -static int imx8mq_mipi_csi_suspend(struct device *dev) -{ - imx8mq_mipi_csi_pm_suspend(dev); - - return 0; -} - -static int imx8mq_mipi_csi_resume(struct device *dev) -{ - return imx8mq_mipi_csi_pm_resume(dev); -} - static int imx8mq_mipi_csi_runtime_suspend(struct device *dev) { struct v4l2_subdev *sd = dev_get_drvdata(dev); struct csi_state *state = mipi_sd_to_csi2_state(sd); int ret; - imx8mq_mipi_csi_pm_suspend(dev); + imx8mq_mipi_csi_stop_stream(state); + imx8mq_mipi_csi_clk_disable(state); ret = icc_set_bw(state->icc_path, 0, 0); if (ret) @@ -711,13 +654,14 @@ static int imx8mq_mipi_csi_runtime_resume(struct device *dev) return ret; } - return imx8mq_mipi_csi_pm_resume(dev); + ret = imx8mq_mipi_csi_clk_enable(state); + + return ret ? -EAGAIN : 0; } static const struct dev_pm_ops imx8mq_mipi_csi_pm_ops = { RUNTIME_PM_OPS(imx8mq_mipi_csi_runtime_suspend, imx8mq_mipi_csi_runtime_resume, NULL) - SYSTEM_SLEEP_PM_OPS(imx8mq_mipi_csi_suspend, imx8mq_mipi_csi_resume) }; /* ----------------------------------------------------------------------------- @@ -854,15 +798,13 @@ static int imx8mq_mipi_csi_probe(struct platform_device *pdev) platform_set_drvdata(pdev, &state->sd); - mutex_init(&state->lock); - ret = imx8mq_mipi_csi_subdev_init(state); if (ret < 0) - goto mutex; + return ret; ret = imx8mq_mipi_csi_init_icc(pdev); if (ret) - goto mutex; + return ret; /* Enable runtime PM. */ pm_runtime_enable(dev); @@ -889,8 +831,6 @@ static int imx8mq_mipi_csi_probe(struct platform_device *pdev) v4l2_async_unregister_subdev(&state->sd); icc: imx8mq_mipi_csi_release_icc(pdev); -mutex: - mutex_destroy(&state->lock); return ret; } @@ -908,7 +848,6 @@ static void imx8mq_mipi_csi_remove(struct platform_device *pdev) imx8mq_mipi_csi_runtime_suspend(&pdev->dev); media_entity_cleanup(&state->sd.entity); v4l2_subdev_cleanup(&state->sd); - mutex_destroy(&state->lock); pm_runtime_set_suspended(&pdev->dev); imx8mq_mipi_csi_release_icc(pdev); }