pm_resume and pm_suspend might be conflict with the ones defined in
include/linux/suspend.h. Rename pm_resume{suspend} to
i915_pm_resume{suspend} since they are only used here.
Signed-off-by: Hsin-Yi Wang <[email protected]>
Reported-by: kernel test robot <[email protected]>
---
drivers/gpu/drm/i915/selftests/i915_gem.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c
index dc394fb7ccfa..525afda9d31f 100644
--- a/drivers/gpu/drm/i915/selftests/i915_gem.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem.c
@@ -94,7 +94,7 @@ static int pm_prepare(struct drm_i915_private *i915)
return 0;
}
-static void pm_suspend(struct drm_i915_private *i915)
+static void i915_pm_suspend(struct drm_i915_private *i915)
{
intel_wakeref_t wakeref;
@@ -116,7 +116,7 @@ static void pm_hibernate(struct drm_i915_private *i915)
}
}
-static void pm_resume(struct drm_i915_private *i915)
+static void i915_pm_resume(struct drm_i915_private *i915)
{
intel_wakeref_t wakeref;
@@ -152,12 +152,12 @@ static int igt_gem_suspend(void *arg)
if (err)
goto out;
- pm_suspend(i915);
+ i915_pm_suspend(i915);
/* Here be dragons! Note that with S3RST any S3 may become S4! */
simulate_hibernate(i915);
- pm_resume(i915);
+ i915_pm_resume(i915);
err = switch_to_context(ctx);
out:
@@ -192,7 +192,7 @@ static int igt_gem_hibernate(void *arg)
/* Here be dragons! */
simulate_hibernate(i915);
- pm_resume(i915);
+ i915_pm_resume(i915);
err = switch_to_context(ctx);
out:
--
2.31.1.295.g9ea45b61b8-goog
On Thu, 15 Apr 2021, Hsin-Yi Wang <[email protected]> wrote:
> pm_resume and pm_suspend might be conflict with the ones defined in
> include/linux/suspend.h. Rename pm_resume{suspend} to
> i915_pm_resume{suspend} since they are only used here.
I agree with the rationale here.
Do you need this to be part of your series, or shall we just pick this
up for i915? (We might consider renaming to something else or prefix the
functions with _ though, as we also have existing i915_pm_suspend and
i915_pm_resume elsewhere.)
BR,
Jani.
>
> Signed-off-by: Hsin-Yi Wang <[email protected]>
> Reported-by: kernel test robot <[email protected]>
> ---
> drivers/gpu/drm/i915/selftests/i915_gem.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c
> index dc394fb7ccfa..525afda9d31f 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_gem.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_gem.c
> @@ -94,7 +94,7 @@ static int pm_prepare(struct drm_i915_private *i915)
> return 0;
> }
>
> -static void pm_suspend(struct drm_i915_private *i915)
> +static void i915_pm_suspend(struct drm_i915_private *i915)
> {
> intel_wakeref_t wakeref;
>
> @@ -116,7 +116,7 @@ static void pm_hibernate(struct drm_i915_private *i915)
> }
> }
>
> -static void pm_resume(struct drm_i915_private *i915)
> +static void i915_pm_resume(struct drm_i915_private *i915)
> {
> intel_wakeref_t wakeref;
>
> @@ -152,12 +152,12 @@ static int igt_gem_suspend(void *arg)
> if (err)
> goto out;
>
> - pm_suspend(i915);
> + i915_pm_suspend(i915);
>
> /* Here be dragons! Note that with S3RST any S3 may become S4! */
> simulate_hibernate(i915);
>
> - pm_resume(i915);
> + i915_pm_resume(i915);
>
> err = switch_to_context(ctx);
> out:
> @@ -192,7 +192,7 @@ static int igt_gem_hibernate(void *arg)
> /* Here be dragons! */
> simulate_hibernate(i915);
>
> - pm_resume(i915);
> + i915_pm_resume(i915);
>
> err = switch_to_context(ctx);
> out:
--
Jani Nikula, Intel Open Source Graphics Center
On Fri, Apr 16, 2021 at 10:23 PM Jani Nikula
<[email protected]> wrote:
>
> On Thu, 15 Apr 2021, Hsin-Yi Wang <[email protected]> wrote:
> > pm_resume and pm_suspend might be conflict with the ones defined in
> > include/linux/suspend.h. Rename pm_resume{suspend} to
> > i915_pm_resume{suspend} since they are only used here.
>
> I agree with the rationale here.
>
> Do you need this to be part of your series, or shall we just pick this
> up for i915? (We might consider renaming to something else or prefix the
> functions with _ though, as we also have existing i915_pm_suspend and
> i915_pm_resume elsewhere.)
>
This patch can be separated from the series, thanks.
> BR,
> Jani.
>
> >
> > Signed-off-by: Hsin-Yi Wang <[email protected]>
> > Reported-by: kernel test robot <[email protected]>
> > ---
> > drivers/gpu/drm/i915/selftests/i915_gem.c | 10 +++++-----
> > 1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c
> > index dc394fb7ccfa..525afda9d31f 100644
> > --- a/drivers/gpu/drm/i915/selftests/i915_gem.c
> > +++ b/drivers/gpu/drm/i915/selftests/i915_gem.c
> > @@ -94,7 +94,7 @@ static int pm_prepare(struct drm_i915_private *i915)
> > return 0;
> > }
> >
> > -static void pm_suspend(struct drm_i915_private *i915)
> > +static void i915_pm_suspend(struct drm_i915_private *i915)
> > {
> > intel_wakeref_t wakeref;
> >
> > @@ -116,7 +116,7 @@ static void pm_hibernate(struct drm_i915_private *i915)
> > }
> > }
> >
> > -static void pm_resume(struct drm_i915_private *i915)
> > +static void i915_pm_resume(struct drm_i915_private *i915)
> > {
> > intel_wakeref_t wakeref;
> >
> > @@ -152,12 +152,12 @@ static int igt_gem_suspend(void *arg)
> > if (err)
> > goto out;
> >
> > - pm_suspend(i915);
> > + i915_pm_suspend(i915);
> >
> > /* Here be dragons! Note that with S3RST any S3 may become S4! */
> > simulate_hibernate(i915);
> >
> > - pm_resume(i915);
> > + i915_pm_resume(i915);
> >
> > err = switch_to_context(ctx);
> > out:
> > @@ -192,7 +192,7 @@ static int igt_gem_hibernate(void *arg)
> > /* Here be dragons! */
> > simulate_hibernate(i915);
> >
> > - pm_resume(i915);
> > + i915_pm_resume(i915);
> >
> > err = switch_to_context(ctx);
> > out:
>
> --
> Jani Nikula, Intel Open Source Graphics Center