media: staging: tegra-vde: Support generic power domain

Currently driver supports legacy power domain API, this patch adds generic
power domain support. This allows us to utilize a modern GENPD API for
newer device-trees.

Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Peter Geis <pgwipeout@gmail.com> # Ouya T30
Tested-by: Paul Fertser <fercerpav@gmail.com> # PAZ00 T20
Tested-by: Nicolas Chauvet <kwizart@gmail.com> # PAZ00 T20 and TK1 T124
Tested-by: Matt Merhar <mattmerhar@protonmail.com> # Ouya T30
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/drivers/staging/media/tegra-vde/vde.c b/drivers/staging/media/tegra-vde/vde.c
index ed4c1250b3038c72239da6ed60c1b1bd77c1670e..859f60a7090499101eab2bff1a32a19e6545cc32 100644 (file)
--- a/drivers/staging/media/tegra-vde/vde.c
+++ b/drivers/staging/media/tegra-vde/vde.c
@@ -20,6 +20,7 @@
 #include <linux/slab.h>
 #include <linux/uaccess.h>
 
+#include <soc/tegra/common.h>
 #include <soc/tegra/pmc.h>
 
 #include "uapi.h"
@@ -920,13 +921,17 @@ static __maybe_unused int tegra_vde_runtime_suspend(struct device *dev)
        struct tegra_vde *vde = dev_get_drvdata(dev);
        int err;
 
-       err = tegra_powergate_power_off(TEGRA_POWERGATE_VDEC);
-       if (err) {
-               dev_err(dev, "Failed to power down HW: %d\n", err);
-               return err;
+       if (!dev->pm_domain) {
+               err = tegra_powergate_power_off(TEGRA_POWERGATE_VDEC);
+               if (err) {
+                       dev_err(dev, "Failed to power down HW: %d\n", err);
+                       return err;
+               }
        }
 
        clk_disable_unprepare(vde->clk);
+       reset_control_release(vde->rst);
+       reset_control_release(vde->rst_mc);
 
        return 0;
 }
@@ -936,14 +941,45 @@ static __maybe_unused int tegra_vde_runtime_resume(struct device *dev)
        struct tegra_vde *vde = dev_get_drvdata(dev);
        int err;
 
-       err = tegra_powergate_sequence_power_up(TEGRA_POWERGATE_VDEC,
-                                               vde->clk, vde->rst);
+       err = reset_control_acquire(vde->rst_mc);
        if (err) {
-               dev_err(dev, "Failed to power up HW : %d\n", err);
+               dev_err(dev, "Failed to acquire mc reset: %d\n", err);
                return err;
        }
 
+       err = reset_control_acquire(vde->rst);
+       if (err) {
+               dev_err(dev, "Failed to acquire reset: %d\n", err);
+               goto release_mc_reset;
+       }
+
+       if (!dev->pm_domain) {
+               err = tegra_powergate_sequence_power_up(TEGRA_POWERGATE_VDEC,
+                                                       vde->clk, vde->rst);
+               if (err) {
+                       dev_err(dev, "Failed to power up HW : %d\n", err);
+                       goto release_reset;
+               }
+       } else {
+               /*
+                * tegra_powergate_sequence_power_up() leaves clocks enabled,
+                * while GENPD not.
+                */
+               err = clk_prepare_enable(vde->clk);
+               if (err) {
+                       dev_err(dev, "Failed to enable clock: %d\n", err);
+                       goto release_reset;
+               }
+       }
+
        return 0;
+
+release_reset:
+       reset_control_release(vde->rst);
+release_mc_reset:
+       reset_control_release(vde->rst_mc);
+
+       return err;
 }
 
 static int tegra_vde_probe(struct platform_device *pdev)
@@ -1001,14 +1037,14 @@ static int tegra_vde_probe(struct platform_device *pdev)
                return err;
        }
 
-       vde->rst = devm_reset_control_get(dev, NULL);
+       vde->rst = devm_reset_control_get_exclusive_released(dev, NULL);
        if (IS_ERR(vde->rst)) {
                err = PTR_ERR(vde->rst);
                dev_err(dev, "Could not get VDE reset %d\n", err);
                return err;
        }
 
-       vde->rst_mc = devm_reset_control_get_optional(dev, "mc");
+       vde->rst_mc = devm_reset_control_get_optional_exclusive_released(dev, "mc");
        if (IS_ERR(vde->rst_mc)) {
                err = PTR_ERR(vde->rst_mc);
                dev_err(dev, "Could not get MC reset %d\n", err);
@@ -1026,6 +1062,12 @@ static int tegra_vde_probe(struct platform_device *pdev)
                return err;
        }
 
+       err = devm_tegra_core_dev_init_opp_table_common(dev);
+       if (err) {
+               dev_err(dev, "Could initialize OPP table %d\n", err);
+               return err;
+       }
+
        vde->iram_pool = of_gen_pool_get(dev->of_node, "iram", 0);
        if (!vde->iram_pool) {
                dev_err(dev, "Could not get IRAM pool\n");
@@ -1133,8 +1175,7 @@ static void tegra_vde_shutdown(struct platform_device *pdev)
         * On some devices bootloader isn't ready to a power-gated VDE on
         * a warm-reboot, machine will hang in that case.
         */
-       if (pm_runtime_status_suspended(&pdev->dev))
-               tegra_vde_runtime_resume(&pdev->dev);
+       pm_runtime_get_sync(&pdev->dev);
 }
 
 static __maybe_unused int tegra_vde_pm_suspend(struct device *dev)