From nobody Tue Apr 7 16:30:08 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51E58ECAAD7 for ; Fri, 26 Aug 2022 18:34:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344761AbiHZSex (ORCPT ); Fri, 26 Aug 2022 14:34:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344975AbiHZSdq (ORCPT ); Fri, 26 Aug 2022 14:33:46 -0400 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6795FE58A2; Fri, 26 Aug 2022 11:33:34 -0700 (PDT) Received: (Authenticated sender: paul.kocialkowski@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 051ADFF808; Fri, 26 Aug 2022 18:33:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1661538812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ei7Gl8Ou6uZlajPIaxv+45oLRsvJq4XdWauff22eOyw=; b=kdeakCut5UsSUlxs7idnwRhGxwoehCNIhA/I1GGFVMsgXiFsdPGbd0ax4Xq1E4hsT4hWFk dzWf3bA2P9c3jI/S2CrYrOUINcvzAHbMx2XzjCBap9IhAr6bsmoxSPWtJr3eDGoI+CbhHR +sCPoWfPEPsLckuVssKKj3+mg4JWr5ebuu7AQXESc8VJNfHfcgC0duhHp/+4UwOcxiq0ny ukW7fq2wBYyInAUeQAmGi1KU1WK6Ibc37k3ik1b802OipRHeFTmak/edOPDfvbdnhULdm7 mwox1vQw49KwOzp9jFuypX+KYDWbhLALTeC8DokXa5nRYcB/lqYBzqhTLt5/6w== From: Paul Kocialkowski To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev Cc: Yong Deng , Paul Kocialkowski , Mauro Carvalho Chehab , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Laurent Pinchart , Maxime Ripard , Thomas Petazzoni Subject: [PATCH v6 23/43] media: sun6i-csi: Move power management to runtime pm in capture Date: Fri, 26 Aug 2022 20:32:20 +0200 Message-Id: <20220826183240.604834-24-paul.kocialkowski@bootlin.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220826183240.604834-1-paul.kocialkowski@bootlin.com> References: <20220826183240.604834-1-paul.kocialkowski@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Let's just enable the module when we start using it (at stream on) and benefit from runtime pm instead of enabling it at first open. Also reorder the call to v4l2_pipeline_pm_get. Signed-off-by: Paul Kocialkowski Acked-by: Jernej Skrabec --- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 24 ----------- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 7 ---- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 41 ++++++++++--------- 3 files changed, 22 insertions(+), 50 deletions(-) diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/m= edia/platform/sunxi/sun6i-csi/sun6i_csi.c index d5318e2b04df..9a12077ea03a 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c @@ -148,30 +148,6 @@ bool sun6i_csi_is_format_supported(struct sun6i_csi_de= vice *csi_dev, return false; } =20 -int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable) -{ - struct device *dev =3D csi_dev->dev; - struct regmap *regmap =3D csi_dev->regmap; - int ret; - - if (!enable) { - regmap_update_bits(regmap, SUN6I_CSI_EN_REG, - SUN6I_CSI_EN_CSI_EN, 0); - pm_runtime_put(dev); - - return 0; - } - - ret =3D pm_runtime_resume_and_get(dev); - if (ret < 0) - return ret; - - regmap_update_bits(regmap, SUN6I_CSI_EN_REG, SUN6I_CSI_EN_CSI_EN, - SUN6I_CSI_EN_CSI_EN); - - return 0; -} - static enum csi_input_fmt get_csi_input_format(struct sun6i_csi_device *cs= i_dev, u32 mbus_code, u32 pixformat) { diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h b/drivers/m= edia/platform/sunxi/sun6i-csi/sun6i_csi.h index a522aedb5ee6..1e3bac1829dc 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h @@ -75,13 +75,6 @@ struct sun6i_csi_variant { bool sun6i_csi_is_format_supported(struct sun6i_csi_device *csi_dev, u32 pixformat, u32 mbus_code); =20 -/** - * sun6i_csi_set_power() - power on/off the csi - * @csi: pointer to the csi - * @enable: on/off - */ -int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable); - /** * sun6i_csi_update_config() - update the csi register settings * @csi: pointer to the csi diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c b/d= rivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c index 4c49d9206898..0b66f3ab1285 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c @@ -6,6 +6,7 @@ */ =20 #include +#include #include =20 #include @@ -141,6 +142,9 @@ static void sun6i_csi_capture_enable(struct sun6i_csi_d= evice *csi_dev) { struct regmap *regmap =3D csi_dev->regmap; =20 + regmap_update_bits(regmap, SUN6I_CSI_EN_REG, SUN6I_CSI_EN_CSI_EN, + SUN6I_CSI_EN_CSI_EN); + regmap_update_bits(regmap, SUN6I_CSI_CAP_REG, SUN6I_CSI_CAP_VCAP_ON, SUN6I_CSI_CAP_VCAP_ON); } @@ -150,6 +154,7 @@ static void sun6i_csi_capture_disable(struct sun6i_csi_= device *csi_dev) struct regmap *regmap =3D csi_dev->regmap; =20 regmap_update_bits(regmap, SUN6I_CSI_CAP_REG, SUN6I_CSI_CAP_VCAP_ON, 0); + regmap_update_bits(regmap, SUN6I_CSI_EN_REG, SUN6I_CSI_EN_CSI_EN, 0); } =20 static void @@ -382,6 +387,7 @@ static int sun6i_csi_capture_start_streaming(struct vb2= _queue *queue, struct sun6i_csi_capture *capture =3D &csi_dev->capture; struct sun6i_csi_capture_state *state =3D &capture->state; struct video_device *video_dev =3D &capture->video_dev; + struct device *dev =3D csi_dev->dev; struct v4l2_subdev *subdev; int ret; =20 @@ -402,6 +408,12 @@ static int sun6i_csi_capture_start_streaming(struct vb= 2_queue *queue, goto error_media_pipeline; } =20 + /* PM */ + + ret =3D pm_runtime_resume_and_get(dev); + if (ret < 0) + goto error_media_pipeline; + /* Clear */ =20 sun6i_csi_capture_irq_clear(csi_dev); @@ -429,6 +441,8 @@ static int sun6i_csi_capture_start_streaming(struct vb2= _queue *queue, sun6i_csi_capture_disable(csi_dev); sun6i_csi_capture_irq_disable(csi_dev); =20 + pm_runtime_put(dev); + error_media_pipeline: media_pipeline_stop(&video_dev->entity); =20 @@ -442,6 +456,7 @@ static void sun6i_csi_capture_stop_streaming(struct vb2= _queue *queue) { struct sun6i_csi_device *csi_dev =3D vb2_get_drv_priv(queue); struct sun6i_csi_capture *capture =3D &csi_dev->capture; + struct device *dev =3D csi_dev->dev; struct v4l2_subdev *subdev; =20 subdev =3D sun6i_csi_capture_remote_subdev(capture, NULL); @@ -451,6 +466,8 @@ static void sun6i_csi_capture_stop_streaming(struct vb2= _queue *queue) sun6i_csi_capture_disable(csi_dev); sun6i_csi_capture_irq_disable(csi_dev); =20 + pm_runtime_put(dev); + media_pipeline_stop(&capture->video_dev.entity); =20 sun6i_csi_capture_state_cleanup(csi_dev, true); @@ -635,27 +652,20 @@ static int sun6i_csi_capture_open(struct file *file) if (mutex_lock_interruptible(&capture->lock)) return -ERESTARTSYS; =20 - ret =3D v4l2_fh_open(file); + ret =3D v4l2_pipeline_pm_get(&capture->video_dev.entity); if (ret < 0) goto error_lock; =20 - ret =3D v4l2_pipeline_pm_get(&capture->video_dev.entity); + ret =3D v4l2_fh_open(file); if (ret < 0) - goto error_v4l2_fh; - - /* Power on at first open. */ - if (v4l2_fh_is_singular_file(file)) { - ret =3D sun6i_csi_set_power(csi_dev, true); - if (ret < 0) - goto error_v4l2_fh; - } + goto error_pipeline; =20 mutex_unlock(&capture->lock); =20 return 0; =20 -error_v4l2_fh: - v4l2_fh_release(file); +error_pipeline: + v4l2_pipeline_pm_put(&capture->video_dev.entity); =20 error_lock: mutex_unlock(&capture->lock); @@ -667,19 +677,12 @@ static int sun6i_csi_capture_close(struct file *file) { struct sun6i_csi_device *csi_dev =3D video_drvdata(file); struct sun6i_csi_capture *capture =3D &csi_dev->capture; - bool last_close; =20 mutex_lock(&capture->lock); =20 - last_close =3D v4l2_fh_is_singular_file(file); - _vb2_fop_release(file, NULL); v4l2_pipeline_pm_put(&capture->video_dev.entity); =20 - /* Power off at last close. */ - if (last_close) - sun6i_csi_set_power(csi_dev, false); - mutex_unlock(&capture->lock); =20 return 0; --=20 2.37.1