| Message ID | 20190725035239.1192-1-zbestahu@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [RESEND] drm: Switch to use DEVFREQ_GOV_SIMPLE_ONDEMAND constant | expand |
On Thu, Jul 25, 2019 at 11:52:39AM +0800, Yue Hu wrote: > From: Yue Hu <huyue2@yulong.com> > > Since governor name is defined by DEVFREQ framework internally, use the > macro definition instead of using the name directly. Acked-by: Jordan Crouse <jcrouse@codeaurora.org> for the msm part. > Signed-off-by: Yue Hu <huyue2@yulong.com> > --- > drivers/gpu/drm/msm/msm_gpu.c | 3 ++- > drivers/gpu/drm/panfrost/panfrost_devfreq.c | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c > index 4edb874..f7308d6 100644 > --- a/drivers/gpu/drm/msm/msm_gpu.c > +++ b/drivers/gpu/drm/msm/msm_gpu.c > @@ -95,7 +95,8 @@ static void msm_devfreq_init(struct msm_gpu *gpu) > */ > > gpu->devfreq.devfreq = devm_devfreq_add_device(&gpu->pdev->dev, > - &msm_devfreq_profile, "simple_ondemand", NULL); > + &msm_devfreq_profile, DEVFREQ_GOV_SIMPLE_ONDEMAND, > + NULL); > > if (IS_ERR(gpu->devfreq.devfreq)) { > DRM_DEV_ERROR(&gpu->pdev->dev, "Couldn't initialize GPU devfreq\n"); > diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c > index db79853..a7c18bc 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c > +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c > @@ -157,7 +157,8 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) > dev_pm_opp_put(opp); > > pfdev->devfreq.devfreq = devm_devfreq_add_device(&pfdev->pdev->dev, > - &panfrost_devfreq_profile, "simple_ondemand", NULL); > + &panfrost_devfreq_profile, DEVFREQ_GOV_SIMPLE_ONDEMAND, > + NULL); > if (IS_ERR(pfdev->devfreq.devfreq)) { > DRM_DEV_ERROR(&pfdev->pdev->dev, "Couldn't initialize GPU devfreq\n"); > ret = PTR_ERR(pfdev->devfreq.devfreq); > -- > 1.9.1 >
On 7/25/19 5:52 AM, Yue Hu wrote: > From: Yue Hu <huyue2@yulong.com> > > Since governor name is defined by DEVFREQ framework internally, use the > macro definition instead of using the name directly. > > Signed-off-by: Yue Hu <huyue2@yulong.com> Acked-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> > --- > drivers/gpu/drm/msm/msm_gpu.c | 3 ++- > drivers/gpu/drm/panfrost/panfrost_devfreq.c | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c > index 4edb874..f7308d6 100644 > --- a/drivers/gpu/drm/msm/msm_gpu.c > +++ b/drivers/gpu/drm/msm/msm_gpu.c > @@ -95,7 +95,8 @@ static void msm_devfreq_init(struct msm_gpu *gpu) > */ > > gpu->devfreq.devfreq = devm_devfreq_add_device(&gpu->pdev->dev, > - &msm_devfreq_profile, "simple_ondemand", NULL); > + &msm_devfreq_profile, DEVFREQ_GOV_SIMPLE_ONDEMAND, > + NULL); > > if (IS_ERR(gpu->devfreq.devfreq)) { > DRM_DEV_ERROR(&gpu->pdev->dev, "Couldn't initialize GPU devfreq\n"); > diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c > index db79853..a7c18bc 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c > +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c > @@ -157,7 +157,8 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) > dev_pm_opp_put(opp); > > pfdev->devfreq.devfreq = devm_devfreq_add_device(&pfdev->pdev->dev, > - &panfrost_devfreq_profile, "simple_ondemand", NULL); > + &panfrost_devfreq_profile, DEVFREQ_GOV_SIMPLE_ONDEMAND, > + NULL); > if (IS_ERR(pfdev->devfreq.devfreq)) { > DRM_DEV_ERROR(&pfdev->pdev->dev, "Couldn't initialize GPU devfreq\n"); > ret = PTR_ERR(pfdev->devfreq.devfreq); >
On Wed, Jul 24, 2019 at 9:53 PM Yue Hu <zbestahu@gmail.com> wrote: > > From: Yue Hu <huyue2@yulong.com> > > Since governor name is defined by DEVFREQ framework internally, use the > macro definition instead of using the name directly. > > Signed-off-by: Yue Hu <huyue2@yulong.com> > --- > drivers/gpu/drm/msm/msm_gpu.c | 3 ++- > drivers/gpu/drm/panfrost/panfrost_devfreq.c | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) I've applied this to drm-misc-next. Rob
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 4edb874..f7308d6 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -95,7 +95,8 @@ static void msm_devfreq_init(struct msm_gpu *gpu) */ gpu->devfreq.devfreq = devm_devfreq_add_device(&gpu->pdev->dev, - &msm_devfreq_profile, "simple_ondemand", NULL); + &msm_devfreq_profile, DEVFREQ_GOV_SIMPLE_ONDEMAND, + NULL); if (IS_ERR(gpu->devfreq.devfreq)) { DRM_DEV_ERROR(&gpu->pdev->dev, "Couldn't initialize GPU devfreq\n"); diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c index db79853..a7c18bc 100644 --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c @@ -157,7 +157,8 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) dev_pm_opp_put(opp); pfdev->devfreq.devfreq = devm_devfreq_add_device(&pfdev->pdev->dev, - &panfrost_devfreq_profile, "simple_ondemand", NULL); + &panfrost_devfreq_profile, DEVFREQ_GOV_SIMPLE_ONDEMAND, + NULL); if (IS_ERR(pfdev->devfreq.devfreq)) { DRM_DEV_ERROR(&pfdev->pdev->dev, "Couldn't initialize GPU devfreq\n"); ret = PTR_ERR(pfdev->devfreq.devfreq);