| Message ID | 20210420130853.10573-1-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/selftests: Rename pm_ prefixed functions names | expand |
On Tue, Apr 20, 2021 at 04:08:53PM +0300, Jani Nikula wrote: > From: Hsin-Yi Wang <hsinyi@chromium.org> > > pm_resume and pm_suspend might be conflict with the ones defined in > include/linux/suspend.h. Rename all pm_* to igt_pm_* in selftests since > they are only used here. > > v2 by Jani: > - Use igt_ prefix instead of i915_ to avoid colliding with existing > i915_pm_* functions what about i915_st_pm?! > - Rename all pm_ prefixed functions in the file > > Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org> > Reported-by: kernel test robot <lkp@intel.com> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/selftests/i915_gem.c | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c > index dc394fb7ccfa..152d9ab135b1 100644 > --- a/drivers/gpu/drm/i915/selftests/i915_gem.c > +++ b/drivers/gpu/drm/i915/selftests/i915_gem.c > @@ -87,14 +87,14 @@ static void simulate_hibernate(struct drm_i915_private *i915) > intel_runtime_pm_put(&i915->runtime_pm, wakeref); > } > > -static int pm_prepare(struct drm_i915_private *i915) > +static int igt_pm_prepare(struct drm_i915_private *i915) > { > i915_gem_suspend(i915); > > return 0; > } > > -static void pm_suspend(struct drm_i915_private *i915) > +static void igt_pm_suspend(struct drm_i915_private *i915) > { > intel_wakeref_t wakeref; > > @@ -104,7 +104,7 @@ static void pm_suspend(struct drm_i915_private *i915) > } > } > > -static void pm_hibernate(struct drm_i915_private *i915) > +static void igt_pm_hibernate(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 igt_pm_resume(struct drm_i915_private *i915) > { > intel_wakeref_t wakeref; > > @@ -148,16 +148,16 @@ static int igt_gem_suspend(void *arg) > if (err) > goto out; > > - err = pm_prepare(i915); > + err = igt_pm_prepare(i915); > if (err) > goto out; > > - pm_suspend(i915); > + igt_pm_suspend(i915); > > /* Here be dragons! Note that with S3RST any S3 may become S4! */ > simulate_hibernate(i915); > > - pm_resume(i915); > + igt_pm_resume(i915); > > err = switch_to_context(ctx); > out: > @@ -183,16 +183,16 @@ static int igt_gem_hibernate(void *arg) > if (err) > goto out; > > - err = pm_prepare(i915); > + err = igt_pm_prepare(i915); > if (err) > goto out; > > - pm_hibernate(i915); > + igt_pm_hibernate(i915); > > /* Here be dragons! */ > simulate_hibernate(i915); > > - pm_resume(i915); > + igt_pm_resume(i915); > > err = switch_to_context(ctx); > out: > -- > 2.20.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Tue, 20 Apr 2021, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote: > On Tue, Apr 20, 2021 at 04:08:53PM +0300, Jani Nikula wrote: >> From: Hsin-Yi Wang <hsinyi@chromium.org> >> >> pm_resume and pm_suspend might be conflict with the ones defined in >> include/linux/suspend.h. Rename all pm_* to igt_pm_* in selftests since >> they are only used here. >> >> v2 by Jani: >> - Use igt_ prefix instead of i915_ to avoid colliding with existing >> i915_pm_* functions > > what about i915_st_pm?! Honestly I don't really care, as long as they don't conflict with what's in suspend.h or i915_drv.c. They are called from functions named igt_gem_suspend() and igt_gem_hibernate(), so I went with igt_. *shrug* BR, Jani. > >> - Rename all pm_ prefixed functions in the file >> >> Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org> >> Reported-by: kernel test robot <lkp@intel.com> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> >> --- >> drivers/gpu/drm/i915/selftests/i915_gem.c | 20 ++++++++++---------- >> 1 file changed, 10 insertions(+), 10 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c >> index dc394fb7ccfa..152d9ab135b1 100644 >> --- a/drivers/gpu/drm/i915/selftests/i915_gem.c >> +++ b/drivers/gpu/drm/i915/selftests/i915_gem.c >> @@ -87,14 +87,14 @@ static void simulate_hibernate(struct drm_i915_private *i915) >> intel_runtime_pm_put(&i915->runtime_pm, wakeref); >> } >> >> -static int pm_prepare(struct drm_i915_private *i915) >> +static int igt_pm_prepare(struct drm_i915_private *i915) >> { >> i915_gem_suspend(i915); >> >> return 0; >> } >> >> -static void pm_suspend(struct drm_i915_private *i915) >> +static void igt_pm_suspend(struct drm_i915_private *i915) >> { >> intel_wakeref_t wakeref; >> >> @@ -104,7 +104,7 @@ static void pm_suspend(struct drm_i915_private *i915) >> } >> } >> >> -static void pm_hibernate(struct drm_i915_private *i915) >> +static void igt_pm_hibernate(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 igt_pm_resume(struct drm_i915_private *i915) >> { >> intel_wakeref_t wakeref; >> >> @@ -148,16 +148,16 @@ static int igt_gem_suspend(void *arg) >> if (err) >> goto out; >> >> - err = pm_prepare(i915); >> + err = igt_pm_prepare(i915); >> if (err) >> goto out; >> >> - pm_suspend(i915); >> + igt_pm_suspend(i915); >> >> /* Here be dragons! Note that with S3RST any S3 may become S4! */ >> simulate_hibernate(i915); >> >> - pm_resume(i915); >> + igt_pm_resume(i915); >> >> err = switch_to_context(ctx); >> out: >> @@ -183,16 +183,16 @@ static int igt_gem_hibernate(void *arg) >> if (err) >> goto out; >> >> - err = pm_prepare(i915); >> + err = igt_pm_prepare(i915); >> if (err) >> goto out; >> >> - pm_hibernate(i915); >> + igt_pm_hibernate(i915); >> >> /* Here be dragons! */ >> simulate_hibernate(i915); >> >> - pm_resume(i915); >> + igt_pm_resume(i915); >> >> err = switch_to_context(ctx); >> out: >> -- >> 2.20.1 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Tue, Apr 20, 2021 at 05:41:47PM +0300, Jani Nikula wrote: > On Tue, 20 Apr 2021, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote: > > On Tue, Apr 20, 2021 at 04:08:53PM +0300, Jani Nikula wrote: > >> From: Hsin-Yi Wang <hsinyi@chromium.org> > >> > >> pm_resume and pm_suspend might be conflict with the ones defined in > >> include/linux/suspend.h. Rename all pm_* to igt_pm_* in selftests since > >> they are only used here. > >> > >> v2 by Jani: > >> - Use igt_ prefix instead of i915_ to avoid colliding with existing > >> i915_pm_* functions > > > > what about i915_st_pm?! > > Honestly I don't really care, as long as they don't conflict with what's > in suspend.h or i915_drv.c. > > They are called from functions named igt_gem_suspend() and > igt_gem_hibernate(), so I went with igt_. *shrug* oh... there was the precedence indeed... let's go with this for now at least... maybe an overal sed later.. Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > > BR, > Jani. > > > > > >> - Rename all pm_ prefixed functions in the file > >> > >> Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org> > >> Reported-by: kernel test robot <lkp@intel.com> > >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> > >> --- > >> drivers/gpu/drm/i915/selftests/i915_gem.c | 20 ++++++++++---------- > >> 1 file changed, 10 insertions(+), 10 deletions(-) > >> > >> diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c > >> index dc394fb7ccfa..152d9ab135b1 100644 > >> --- a/drivers/gpu/drm/i915/selftests/i915_gem.c > >> +++ b/drivers/gpu/drm/i915/selftests/i915_gem.c > >> @@ -87,14 +87,14 @@ static void simulate_hibernate(struct drm_i915_private *i915) > >> intel_runtime_pm_put(&i915->runtime_pm, wakeref); > >> } > >> > >> -static int pm_prepare(struct drm_i915_private *i915) > >> +static int igt_pm_prepare(struct drm_i915_private *i915) > >> { > >> i915_gem_suspend(i915); > >> > >> return 0; > >> } > >> > >> -static void pm_suspend(struct drm_i915_private *i915) > >> +static void igt_pm_suspend(struct drm_i915_private *i915) > >> { > >> intel_wakeref_t wakeref; > >> > >> @@ -104,7 +104,7 @@ static void pm_suspend(struct drm_i915_private *i915) > >> } > >> } > >> > >> -static void pm_hibernate(struct drm_i915_private *i915) > >> +static void igt_pm_hibernate(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 igt_pm_resume(struct drm_i915_private *i915) > >> { > >> intel_wakeref_t wakeref; > >> > >> @@ -148,16 +148,16 @@ static int igt_gem_suspend(void *arg) > >> if (err) > >> goto out; > >> > >> - err = pm_prepare(i915); > >> + err = igt_pm_prepare(i915); > >> if (err) > >> goto out; > >> > >> - pm_suspend(i915); > >> + igt_pm_suspend(i915); > >> > >> /* Here be dragons! Note that with S3RST any S3 may become S4! */ > >> simulate_hibernate(i915); > >> > >> - pm_resume(i915); > >> + igt_pm_resume(i915); > >> > >> err = switch_to_context(ctx); > >> out: > >> @@ -183,16 +183,16 @@ static int igt_gem_hibernate(void *arg) > >> if (err) > >> goto out; > >> > >> - err = pm_prepare(i915); > >> + err = igt_pm_prepare(i915); > >> if (err) > >> goto out; > >> > >> - pm_hibernate(i915); > >> + igt_pm_hibernate(i915); > >> > >> /* Here be dragons! */ > >> simulate_hibernate(i915); > >> > >> - pm_resume(i915); > >> + igt_pm_resume(i915); > >> > >> err = switch_to_context(ctx); > >> out: > >> -- > >> 2.20.1 > >> > >> _______________________________________________ > >> Intel-gfx mailing list > >> Intel-gfx@lists.freedesktop.org > >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Jani Nikula, Intel Open Source Graphics Center > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Tue, 20 Apr 2021, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote: > On Tue, Apr 20, 2021 at 05:41:47PM +0300, Jani Nikula wrote: >> On Tue, 20 Apr 2021, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote: >> > On Tue, Apr 20, 2021 at 04:08:53PM +0300, Jani Nikula wrote: >> >> From: Hsin-Yi Wang <hsinyi@chromium.org> >> >> >> >> pm_resume and pm_suspend might be conflict with the ones defined in >> >> include/linux/suspend.h. Rename all pm_* to igt_pm_* in selftests since >> >> they are only used here. >> >> >> >> v2 by Jani: >> >> - Use igt_ prefix instead of i915_ to avoid colliding with existing >> >> i915_pm_* functions >> > >> > what about i915_st_pm?! >> >> Honestly I don't really care, as long as they don't conflict with what's >> in suspend.h or i915_drv.c. >> >> They are called from functions named igt_gem_suspend() and >> igt_gem_hibernate(), so I went with igt_. *shrug* > > oh... there was the precedence indeed... > let's go with this for now at least... maybe an overal sed later.. > > > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Thanks, pushed. BR, Jani. > > >> >> >> BR, >> Jani. >> >> >> > >> >> - Rename all pm_ prefixed functions in the file >> >> >> >> Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org> >> >> Reported-by: kernel test robot <lkp@intel.com> >> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> >> >> --- >> >> drivers/gpu/drm/i915/selftests/i915_gem.c | 20 ++++++++++---------- >> >> 1 file changed, 10 insertions(+), 10 deletions(-) >> >> >> >> diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c >> >> index dc394fb7ccfa..152d9ab135b1 100644 >> >> --- a/drivers/gpu/drm/i915/selftests/i915_gem.c >> >> +++ b/drivers/gpu/drm/i915/selftests/i915_gem.c >> >> @@ -87,14 +87,14 @@ static void simulate_hibernate(struct drm_i915_private *i915) >> >> intel_runtime_pm_put(&i915->runtime_pm, wakeref); >> >> } >> >> >> >> -static int pm_prepare(struct drm_i915_private *i915) >> >> +static int igt_pm_prepare(struct drm_i915_private *i915) >> >> { >> >> i915_gem_suspend(i915); >> >> >> >> return 0; >> >> } >> >> >> >> -static void pm_suspend(struct drm_i915_private *i915) >> >> +static void igt_pm_suspend(struct drm_i915_private *i915) >> >> { >> >> intel_wakeref_t wakeref; >> >> >> >> @@ -104,7 +104,7 @@ static void pm_suspend(struct drm_i915_private *i915) >> >> } >> >> } >> >> >> >> -static void pm_hibernate(struct drm_i915_private *i915) >> >> +static void igt_pm_hibernate(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 igt_pm_resume(struct drm_i915_private *i915) >> >> { >> >> intel_wakeref_t wakeref; >> >> >> >> @@ -148,16 +148,16 @@ static int igt_gem_suspend(void *arg) >> >> if (err) >> >> goto out; >> >> >> >> - err = pm_prepare(i915); >> >> + err = igt_pm_prepare(i915); >> >> if (err) >> >> goto out; >> >> >> >> - pm_suspend(i915); >> >> + igt_pm_suspend(i915); >> >> >> >> /* Here be dragons! Note that with S3RST any S3 may become S4! */ >> >> simulate_hibernate(i915); >> >> >> >> - pm_resume(i915); >> >> + igt_pm_resume(i915); >> >> >> >> err = switch_to_context(ctx); >> >> out: >> >> @@ -183,16 +183,16 @@ static int igt_gem_hibernate(void *arg) >> >> if (err) >> >> goto out; >> >> >> >> - err = pm_prepare(i915); >> >> + err = igt_pm_prepare(i915); >> >> if (err) >> >> goto out; >> >> >> >> - pm_hibernate(i915); >> >> + igt_pm_hibernate(i915); >> >> >> >> /* Here be dragons! */ >> >> simulate_hibernate(i915); >> >> >> >> - pm_resume(i915); >> >> + igt_pm_resume(i915); >> >> >> >> err = switch_to_context(ctx); >> >> out: >> >> -- >> >> 2.20.1 >> >> >> >> _______________________________________________ >> >> Intel-gfx mailing list >> >> Intel-gfx@lists.freedesktop.org >> >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx >> >> -- >> Jani Nikula, Intel Open Source Graphics Center >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c index dc394fb7ccfa..152d9ab135b1 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem.c @@ -87,14 +87,14 @@ static void simulate_hibernate(struct drm_i915_private *i915) intel_runtime_pm_put(&i915->runtime_pm, wakeref); } -static int pm_prepare(struct drm_i915_private *i915) +static int igt_pm_prepare(struct drm_i915_private *i915) { i915_gem_suspend(i915); return 0; } -static void pm_suspend(struct drm_i915_private *i915) +static void igt_pm_suspend(struct drm_i915_private *i915) { intel_wakeref_t wakeref; @@ -104,7 +104,7 @@ static void pm_suspend(struct drm_i915_private *i915) } } -static void pm_hibernate(struct drm_i915_private *i915) +static void igt_pm_hibernate(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 igt_pm_resume(struct drm_i915_private *i915) { intel_wakeref_t wakeref; @@ -148,16 +148,16 @@ static int igt_gem_suspend(void *arg) if (err) goto out; - err = pm_prepare(i915); + err = igt_pm_prepare(i915); if (err) goto out; - pm_suspend(i915); + igt_pm_suspend(i915); /* Here be dragons! Note that with S3RST any S3 may become S4! */ simulate_hibernate(i915); - pm_resume(i915); + igt_pm_resume(i915); err = switch_to_context(ctx); out: @@ -183,16 +183,16 @@ static int igt_gem_hibernate(void *arg) if (err) goto out; - err = pm_prepare(i915); + err = igt_pm_prepare(i915); if (err) goto out; - pm_hibernate(i915); + igt_pm_hibernate(i915); /* Here be dragons! */ simulate_hibernate(i915); - pm_resume(i915); + igt_pm_resume(i915); err = switch_to_context(ctx); out: