From: Benoit Parrot <bparrot@ti.com>
To: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Prabhakar Lad <prabhakar.csengg@gmail.com>,
<linux-media@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, Dave Gerlach <d-gerlach@ti.com>,
Jyri Sarha <jsarha@ti.com>, Benoit Parrot <bparrot@ti.com>
Subject: [Patch v2 01/13] media: am437x-vpfe: Fix suspend path to always handle pinctrl config
Date: Thu, 19 Sep 2019 15:41:13 -0500 [thread overview]
Message-ID: <20190919204125.15254-2-bparrot@ti.com> (raw)
In-Reply-To: <20190919204125.15254-1-bparrot@ti.com>
From: Dave Gerlach <d-gerlach@ti.com>
Currently if vpfe is not active then it returns immediately in the
suspend and resume handlers. Change this so that it always performs the
pinctrl config so that we can still get proper sleep state configuration
on the pins even if we do not need to worry about fully saving and
restoring context.
Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Benoit Parrot <bparrot@ti.com>
---
drivers/media/platform/am437x/am437x-vpfe.c | 46 ++++++++++-----------
1 file changed, 22 insertions(+), 24 deletions(-)
diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/am437x/am437x-vpfe.c
index 2b42ba1f5949..a3d22f90e64c 100644
--- a/drivers/media/platform/am437x/am437x-vpfe.c
+++ b/drivers/media/platform/am437x/am437x-vpfe.c
@@ -2653,22 +2653,21 @@ static int vpfe_suspend(struct device *dev)
struct vpfe_device *vpfe = dev_get_drvdata(dev);
struct vpfe_ccdc *ccdc = &vpfe->ccdc;
- /* if streaming has not started we don't care */
- if (!vb2_start_streaming_called(&vpfe->buffer_queue))
- return 0;
-
- pm_runtime_get_sync(dev);
- vpfe_config_enable(ccdc, 1);
+ /* only do full suspend if streaming has started */
+ if (vb2_start_streaming_called(&vpfe->buffer_queue)) {
+ pm_runtime_get_sync(dev);
+ vpfe_config_enable(ccdc, 1);
- /* Save VPFE context */
- vpfe_save_context(ccdc);
+ /* Save VPFE context */
+ vpfe_save_context(ccdc);
- /* Disable CCDC */
- vpfe_pcr_enable(ccdc, 0);
- vpfe_config_enable(ccdc, 0);
+ /* Disable CCDC */
+ vpfe_pcr_enable(ccdc, 0);
+ vpfe_config_enable(ccdc, 0);
- /* Disable both master and slave clock */
- pm_runtime_put_sync(dev);
+ /* Disable both master and slave clock */
+ pm_runtime_put_sync(dev);
+ }
/* Select sleep pin state */
pinctrl_pm_select_sleep_state(dev);
@@ -2710,19 +2709,18 @@ static int vpfe_resume(struct device *dev)
struct vpfe_device *vpfe = dev_get_drvdata(dev);
struct vpfe_ccdc *ccdc = &vpfe->ccdc;
- /* if streaming has not started we don't care */
- if (!vb2_start_streaming_called(&vpfe->buffer_queue))
- return 0;
-
- /* Enable both master and slave clock */
- pm_runtime_get_sync(dev);
- vpfe_config_enable(ccdc, 1);
+ /* only do full resume if streaming has started */
+ if (vb2_start_streaming_called(&vpfe->buffer_queue)) {
+ /* Enable both master and slave clock */
+ pm_runtime_get_sync(dev);
+ vpfe_config_enable(ccdc, 1);
- /* Restore VPFE context */
- vpfe_restore_context(ccdc);
+ /* Restore VPFE context */
+ vpfe_restore_context(ccdc);
- vpfe_config_enable(ccdc, 0);
- pm_runtime_put_sync(dev);
+ vpfe_config_enable(ccdc, 0);
+ pm_runtime_put_sync(dev);
+ }
/* Select default pin state */
pinctrl_pm_select_default_state(dev);
--
2.17.1
next prev parent reply other threads:[~2019-09-19 20:40 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-19 20:41 [Patch 00/13] media: am437x-vpfe: overdue maintenance Benoit Parrot
2019-09-19 20:41 ` Benoit Parrot [this message]
2019-09-19 20:41 ` [Patch v2 02/13] media: am437x-vpfe: Fix missing first line Benoit Parrot
2019-09-19 20:41 ` [Patch v2 03/13] media: am437x-vpfe: Rework ISR routine for clarity Benoit Parrot
2019-09-19 20:41 ` [Patch v2 04/13] media: am437x-vpfe: Wait for end of frame before tear-down Benoit Parrot
2019-09-19 20:41 ` [Patch v2 05/13] media: am437x-vpfe: fix start streaming error path Benoit Parrot
2019-09-19 20:41 ` [Patch v2 06/13] media: am437x-vpfe: Streamlined vb2 buffer cleanup Benoit Parrot
2019-09-19 20:41 ` [Patch v2 07/13] media: am437x-vpfe: Setting STD to current value is not an error Benoit Parrot
2019-09-19 20:41 ` [Patch v2 08/13] media: am437x-vpfe: Use a per instance format array instead of a static one Benoit Parrot
2019-09-20 8:19 ` Hans Verkuil
2019-09-20 12:13 ` Benoit Parrot
2019-09-19 20:41 ` [Patch v2 09/13] media: am437x-vpfe: fix function trace debug log Benoit Parrot
2019-09-19 20:41 ` [Patch v2 10/13] media: am437x-vpfe: Remove print_fourcc helper Benoit Parrot
2019-09-20 8:21 ` Hans Verkuil
2019-09-20 12:18 ` Benoit Parrot
2019-09-19 20:41 ` [Patch v2 11/13] media: am437x-vpfe: TRY_FMT ioctl is not really trying anything Benoit Parrot
2019-09-19 20:41 ` [Patch v2 12/13] media: am437x-vpfe: Remove per bus width static data Benoit Parrot
2019-09-19 20:41 ` [Patch v2 13/13] media: am437x-vpfe: Switch to SPDX Licensing Benoit Parrot
2019-09-20 8:25 ` [Patch 00/13] media: am437x-vpfe: overdue maintenance Hans Verkuil
2019-09-20 12:20 ` Benoit Parrot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190919204125.15254-2-bparrot@ti.com \
--to=bparrot@ti.com \
--cc=d-gerlach@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=hverkuil@xs4all.nl \
--cc=jsarha@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=prabhakar.csengg@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).