lkml.org 
[lkml]   [2020]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 034/255] drm/panfrost: move devfreq_init()/fini() in device
    Date
    From: Clément Péron <peron.clem@gmail.com>

    [ Upstream commit 25e247bbf85af3ad721dfeb2e2caf405f43b7e66 ]

    Later we will introduce devfreq probing regulator if they
    are present. As regulator should be probe only one time we
    need to get this logic in the device_init().

    panfrost_device is already taking care of devfreq_resume()
    and devfreq_suspend(), so it's not totally illogic to move
    the devfreq_init() and devfreq_fini() here.

    Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
    Reviewed-by: Steven Price <steven.price@arm.com>
    Signed-off-by: Clément Péron <peron.clem@gmail.com>
    Signed-off-by: Rob Herring <robh@kernel.org>
    Link: https://patchwork.freedesktop.org/patch/msgid/20200710095409.407087-9-peron.clem@gmail.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/panfrost/panfrost_device.c | 12 +++++++++++-
    drivers/gpu/drm/panfrost/panfrost_drv.c | 15 ++-------------
    2 files changed, 13 insertions(+), 14 deletions(-)

    diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c
    index 9f89984f652a6..36b5c8fea3eba 100644
    --- a/drivers/gpu/drm/panfrost/panfrost_device.c
    +++ b/drivers/gpu/drm/panfrost/panfrost_device.c
    @@ -214,9 +214,16 @@ int panfrost_device_init(struct panfrost_device *pfdev)
    return err;
    }

    + err = panfrost_devfreq_init(pfdev);
    + if (err) {
    + if (err != -EPROBE_DEFER)
    + dev_err(pfdev->dev, "devfreq init failed %d\n", err);
    + goto out_clk;
    + }
    +
    err = panfrost_regulator_init(pfdev);
    if (err)
    - goto out_clk;
    + goto out_devfreq;

    err = panfrost_reset_init(pfdev);
    if (err) {
    @@ -265,6 +272,8 @@ out_reset:
    panfrost_reset_fini(pfdev);
    out_regulator:
    panfrost_regulator_fini(pfdev);
    +out_devfreq:
    + panfrost_devfreq_fini(pfdev);
    out_clk:
    panfrost_clk_fini(pfdev);
    return err;
    @@ -278,6 +287,7 @@ void panfrost_device_fini(struct panfrost_device *pfdev)
    panfrost_gpu_fini(pfdev);
    panfrost_pm_domain_fini(pfdev);
    panfrost_reset_fini(pfdev);
    + panfrost_devfreq_fini(pfdev);
    panfrost_regulator_fini(pfdev);
    panfrost_clk_fini(pfdev);
    }
    diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
    index f6d5d03201fad..f2dd259f28995 100644
    --- a/drivers/gpu/drm/panfrost/panfrost_drv.c
    +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
    @@ -14,7 +14,6 @@
    #include <drm/drm_utils.h>

    #include "panfrost_device.h"
    -#include "panfrost_devfreq.h"
    #include "panfrost_gem.h"
    #include "panfrost_mmu.h"
    #include "panfrost_job.h"
    @@ -606,13 +605,6 @@ static int panfrost_probe(struct platform_device *pdev)
    goto err_out0;
    }

    - err = panfrost_devfreq_init(pfdev);
    - if (err) {
    - if (err != -EPROBE_DEFER)
    - dev_err(&pdev->dev, "Fatal error during devfreq init\n");
    - goto err_out1;
    - }
    -
    pm_runtime_set_active(pfdev->dev);
    pm_runtime_mark_last_busy(pfdev->dev);
    pm_runtime_enable(pfdev->dev);
    @@ -625,16 +617,14 @@ static int panfrost_probe(struct platform_device *pdev)
    */
    err = drm_dev_register(ddev, 0);
    if (err < 0)
    - goto err_out2;
    + goto err_out1;

    panfrost_gem_shrinker_init(ddev);

    return 0;

    -err_out2:
    - pm_runtime_disable(pfdev->dev);
    - panfrost_devfreq_fini(pfdev);
    err_out1:
    + pm_runtime_disable(pfdev->dev);
    panfrost_device_fini(pfdev);
    err_out0:
    drm_dev_put(ddev);
    @@ -650,7 +640,6 @@ static int panfrost_remove(struct platform_device *pdev)
    panfrost_gem_shrinker_cleanup(ddev);

    pm_runtime_get_sync(pfdev->dev);
    - panfrost_devfreq_fini(pfdev);
    panfrost_device_fini(pfdev);
    pm_runtime_put_sync_suspend(pfdev->dev);
    pm_runtime_disable(pfdev->dev);
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-11-17 14:40    [W:3.470 / U:1.576 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site