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=-6.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 D01BFC2D0EA for ; Wed, 8 Apr 2020 14:59:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9A54F20820 for ; Wed, 8 Apr 2020 14:59:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="f4/ot8g3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729211AbgDHO7c (ORCPT ); Wed, 8 Apr 2020 10:59:32 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:33360 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728740AbgDHO7c (ORCPT ); Wed, 8 Apr 2020 10:59:32 -0400 Received: by mail-wm1-f67.google.com with SMTP id v8so208135wma.0; Wed, 08 Apr 2020 07:59:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B+r4gkbc6fM0v/g3mxY/I2uTuzgVN8+Wm0SyCK/MN3k=; b=f4/ot8g3Nt/P4fbSusRTOOyNhXcnrbHZHkkbxAay/zEKE48auughz/L5BmQJPGIwWd 0ZNqS3OjoqgmIUUyRbeNynXnZOpV2gYuJf+k1FiQf5vdUXI+iPT2tEi40glJlrC2+H7A ourB/s5Q0vwN+Je4D967XhARBP7aWg/gULoiH5c1ChSkPUYO3eOotczSgdpcX5eQOT38 W8mgz5rEu4CPHo8abajLnERbLW7zMwGBiSCXCxDg8B1l4MGhPLBJ8El0nhSfaMYm4nGu ZzApnqbsGHVkebHkcx1D6rWJTxFJKm/GCQevIde7cXk6a3A8ub+2e7aVo0sgt39AjbY+ 5xJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=B+r4gkbc6fM0v/g3mxY/I2uTuzgVN8+Wm0SyCK/MN3k=; b=FFJ5c0xafNi5XV4wfkr7BeSb9tqSiz5Uqu12xy3eCecbqoO0cBtaDcUKEi339V6BT2 zQSN93VktG1BCetqw5wX5jujjZQjpsriCpCkuU6zZ2TcAW4ruo5BDBJgMbVmySqH1diX z3ccwLOZEDqjDeEH9TiKYPqEHmSrJx63KWvuqyISclUi2Fcpj09uGubmRCgKkJ+JpaYy cFjkahmns1duO6x5BISFqVzf63Np59kXytCsgctdipRtQ9jXqq9qOl0uuWZ49xQ/QI6g eljlrylqcDl8Y6cLb00M15hq1iuA0pTBJ98UzG7kacbyl2JYMKNL9c3guzlSvXP/jJJ9 gFRQ== X-Gm-Message-State: AGi0PuZDidArqOCiSc+Vs0QxvQs9xYOiuXkDVVbuGyj0/MVTqAXqgCa1 JOJitNMgeWw8u7a7zw29o7A= X-Google-Smtp-Source: APiQypKXmz02+BgCPHqwRbMKtHmW16CsFz8JzYLXb8XhuvtG5HoWkyVCRwbBw2sTo+VzSquAPEGVqQ== X-Received: by 2002:a1c:a913:: with SMTP id s19mr5338458wme.134.1586357969845; Wed, 08 Apr 2020 07:59:29 -0700 (PDT) Received: from jernej-laptop.localnet (cpe-194-152-20-232.static.triera.net. [194.152.20.232]) by smtp.gmail.com with ESMTPSA id f141sm7297051wmf.3.2020.04.08.07.59.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2020 07:59:28 -0700 (PDT) From: Jernej =?utf-8?B?xaBrcmFiZWM=?= To: Maxime Ripard , Paul Kocialkowski , Chen-Yu Tsai , Mauro Carvalho Chehab , Greg Kroah-Hartman , linux-sunxi@googlegroups.com Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-sunxi@googlegroups.com, Samuel Holland , samuel@sholland.org Subject: Re: [linux-sunxi] [PATCH] media: cedrus: Implement runtime PM Date: Wed, 08 Apr 2020 16:59:26 +0200 Message-ID: <4520243.GXAFRqVoOG@jernej-laptop> In-Reply-To: <20200408010232.48432-1-samuel@sholland.org> References: <20200408010232.48432-1-samuel@sholland.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Samuel! Dne sreda, 08. april 2020 ob 03:02:32 CEST je Samuel Holland napisal(a): > This allows the VE clocks and PLL_VE to be disabled most of the time. > > Since the device is stateless, each frame gets a separate runtime PM > reference. Enable autosuspend so the PM callbacks are not run before and > after every frame. > > Signed-off-by: Samuel Holland > --- > > I tested this with v4l2-request-test. I don't have the setup to do > anything more complicated at the moment. Let me test this in LibreELEC with several videos and different SoCs. Best regards, Jernej > > --- > drivers/staging/media/sunxi/cedrus/cedrus.c | 7 ++ > .../staging/media/sunxi/cedrus/cedrus_hw.c | 115 ++++++++++++------ > .../staging/media/sunxi/cedrus/cedrus_hw.h | 3 + > 3 files changed, 88 insertions(+), 37 deletions(-) > > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c > b/drivers/staging/media/sunxi/cedrus/cedrus.c index > 3fad5edccd17..9aa1fc8a6c26 100644 > --- a/drivers/staging/media/sunxi/cedrus/cedrus.c > +++ b/drivers/staging/media/sunxi/cedrus/cedrus.c > @@ -16,6 +16,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -474,6 +475,11 @@ static int cedrus_remove(struct platform_device *pdev) > return 0; > } > > +static const struct dev_pm_ops cedrus_dev_pm_ops = { > + SET_RUNTIME_PM_OPS(cedrus_hw_suspend, > + cedrus_hw_resume, NULL) > +}; > + > static const struct cedrus_variant sun4i_a10_cedrus_variant = { > .mod_rate = 320000000, > }; > @@ -559,6 +565,7 @@ static struct platform_driver cedrus_driver = { > .driver = { > .name = CEDRUS_NAME, > .of_match_table = of_match_ptr(cedrus_dt_match), > + .pm = &cedrus_dev_pm_ops, > }, > }; > module_platform_driver(cedrus_driver); > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c > b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c index > daf5f244f93b..b84814d5afe4 100644 > --- a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c > +++ b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -63,6 +64,8 @@ int cedrus_engine_enable(struct cedrus_ctx *ctx, enum > cedrus_codec codec) if (ctx->src_fmt.width > 2048) > reg |= VE_MODE_PIC_WIDTH_MORE_2048; > > + pm_runtime_get_sync(ctx->dev->dev); > + > cedrus_write(ctx->dev, VE_MODE, reg); > > return 0; > @@ -71,6 +74,9 @@ int cedrus_engine_enable(struct cedrus_ctx *ctx, enum > cedrus_codec codec) void cedrus_engine_disable(struct cedrus_dev *dev) > { > cedrus_write(dev, VE_MODE, VE_MODE_DISABLED); > + > + pm_runtime_mark_last_busy(dev->dev); > + pm_runtime_put_autosuspend(dev->dev); > } > > void cedrus_dst_format_set(struct cedrus_dev *dev, > @@ -134,12 +140,72 @@ static irqreturn_t cedrus_irq(int irq, void *data) > else > state = VB2_BUF_STATE_DONE; > > + cedrus_engine_disable(dev); > + > v4l2_m2m_buf_done_and_job_finish(ctx->dev->m2m_dev, ctx- >fh.m2m_ctx, > state); > > return IRQ_HANDLED; > } > > +int cedrus_hw_resume(struct device *d) > +{ > + struct cedrus_dev *dev = dev_get_drvdata(d); > + int ret; > + > + ret = clk_prepare_enable(dev->ahb_clk); > + if (ret) { > + dev_err(dev->dev, "Failed to enable AHB clock\n"); > + > + return ret; > + } > + > + ret = clk_prepare_enable(dev->mod_clk); > + if (ret) { > + dev_err(dev->dev, "Failed to enable MOD clock\n"); > + > + goto err_ahb_clk; > + } > + > + ret = clk_prepare_enable(dev->ram_clk); > + if (ret) { > + dev_err(dev->dev, "Failed to enable RAM clock\n"); > + > + goto err_mod_clk; > + } > + > + ret = reset_control_reset(dev->rstc); > + if (ret) { > + dev_err(dev->dev, "Failed to apply reset\n"); > + > + goto err_ram_clk; > + } > + > + return 0; > + > +err_ram_clk: > + clk_disable_unprepare(dev->ram_clk); > +err_mod_clk: > + clk_disable_unprepare(dev->mod_clk); > +err_ahb_clk: > + clk_disable_unprepare(dev->ahb_clk); > + > + return ret; > +} > + > +int cedrus_hw_suspend(struct device *d) > +{ > + struct cedrus_dev *dev = dev_get_drvdata(d); > + > + reset_control_assert(dev->rstc); > + > + clk_disable_unprepare(dev->ram_clk); > + clk_disable_unprepare(dev->mod_clk); > + clk_disable_unprepare(dev->ahb_clk); > + > + return 0; > +} > + > int cedrus_hw_probe(struct cedrus_dev *dev) > { > const struct cedrus_variant *variant; > @@ -236,42 +302,19 @@ int cedrus_hw_probe(struct cedrus_dev *dev) > goto err_sram; > } > > - ret = clk_prepare_enable(dev->ahb_clk); > - if (ret) { > - dev_err(dev->dev, "Failed to enable AHB clock\n"); > - > - goto err_sram; > - } > - > - ret = clk_prepare_enable(dev->mod_clk); > - if (ret) { > - dev_err(dev->dev, "Failed to enable MOD clock\n"); > - > - goto err_ahb_clk; > - } > - > - ret = clk_prepare_enable(dev->ram_clk); > - if (ret) { > - dev_err(dev->dev, "Failed to enable RAM clock\n"); > - > - goto err_mod_clk; > - } > - > - ret = reset_control_reset(dev->rstc); > - if (ret) { > - dev_err(dev->dev, "Failed to apply reset\n"); > - > - goto err_ram_clk; > + pm_runtime_set_autosuspend_delay(dev->dev, 1000); > + pm_runtime_use_autosuspend(dev->dev); > + pm_runtime_enable(dev->dev); > + if (!pm_runtime_enabled(dev->dev)) { > + ret = cedrus_hw_resume(dev->dev); > + if (ret) > + goto err_pm; > } > > return 0; > > -err_ram_clk: > - clk_disable_unprepare(dev->ram_clk); > -err_mod_clk: > - clk_disable_unprepare(dev->mod_clk); > -err_ahb_clk: > - clk_disable_unprepare(dev->ahb_clk); > +err_pm: > + pm_runtime_disable(dev->dev); > err_sram: > sunxi_sram_release(dev->dev); > err_mem: > @@ -282,11 +325,9 @@ int cedrus_hw_probe(struct cedrus_dev *dev) > > void cedrus_hw_remove(struct cedrus_dev *dev) > { > - reset_control_assert(dev->rstc); > - > - clk_disable_unprepare(dev->ram_clk); > - clk_disable_unprepare(dev->mod_clk); > - clk_disable_unprepare(dev->ahb_clk); > + pm_runtime_disable(dev->dev); > + if (!pm_runtime_status_suspended(dev->dev)) > + cedrus_hw_suspend(dev->dev); > > sunxi_sram_release(dev->dev); > > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_hw.h > b/drivers/staging/media/sunxi/cedrus/cedrus_hw.h index > 604ff932fbf5..17822b470a1e 100644 > --- a/drivers/staging/media/sunxi/cedrus/cedrus_hw.h > +++ b/drivers/staging/media/sunxi/cedrus/cedrus_hw.h > @@ -22,6 +22,9 @@ void cedrus_engine_disable(struct cedrus_dev *dev); > void cedrus_dst_format_set(struct cedrus_dev *dev, > struct v4l2_pix_format *fmt); > > +int cedrus_hw_resume(struct device *dev); > +int cedrus_hw_suspend(struct device *dev); > + > int cedrus_hw_probe(struct cedrus_dev *dev); > void cedrus_hw_remove(struct cedrus_dev *dev);