[PATCH] drm/amdgpu: fix debugfs creation/removal, again

[Alex Deucher]

On Fri, Dec 4, 2020 at 1:17 AM Zhou1, Tao <Tao.Zhou1 at amd.com> wrote:
>
> [AMD Public Use]
>
> Reviewed-by: Tao Zhou <tao.zhou1 at amd.com>

Applied.  Thanks!

Alex

>
> > -----Original Message-----
> > From: Arnd Bergmann <arnd at kernel.org>
> > Sent: Friday, December 4, 2020 7:07 AM
> > To: Deucher, Alexander <Alexander.Deucher at amd.com>; Koenig, Christian
> > <Christian.Koenig at amd.com>; David Airlie <airlied at linux.ie>; Daniel Vetter
> > <daniel at ffwll.ch>; Li, Dennis <Dennis.Li at amd.com>; Zhou1, Tao
> > <Tao.Zhou1 at amd.com>; Chen, Guchun <Guchun.Chen at amd.com>
> > Cc: Arnd Bergmann <arnd at arndb.de>; Zhang, Hawking
> > <Hawking.Zhang at amd.com>; Clements, John <John.Clements at amd.com>;
> > Yang, Stanley <Stanley.Yang at amd.com>; Ma, Le <Le.Ma at amd.com>; amd-
> > gfx at lists.freedesktop.org; dri-devel at lists.freedesktop.org; linux-
> > kernel at vger.kernel.org
> > Subject: [PATCH] drm/amdgpu: fix debugfs creation/removal, again
> >
> > From: Arnd Bergmann <arnd at arndb.de>
> >
> > There is still a warning when CONFIG_DEBUG_FS is disabled:
> >
> > drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c:1145:13: error:
> > 'amdgpu_ras_debugfs_create_ctrl_node' defined but not used [-
> > Werror=unused-function]
> >  1145 | static void amdgpu_ras_debugfs_create_ctrl_node(struct
> > amdgpu_device *adev)
> >
> > Change the code again to make the compiler actually drop this code but not
> > warn about it.
> >
> > Fixes: ae2bf61ff39e ("drm/amdgpu: guard ras debugfs creation/removal based
> > on CONFIG_DEBUG_FS")
> > Signed-off-by: Arnd Bergmann <arnd at arndb.de>
> > ---
> >  drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 13 +++++--------
> > drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h |  6 ------
> >  2 files changed, 5 insertions(+), 14 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> > index 9d11b847e6ef..c136bd449744 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> > @@ -1167,7 +1167,7 @@ static void
> > amdgpu_ras_debugfs_create_ctrl_node(struct amdgpu_device *adev)
> >                       con->dir, &con->disable_ras_err_cnt_harvest);
> >  }
> >
> > -void amdgpu_ras_debugfs_create(struct amdgpu_device *adev,
> > +static void amdgpu_ras_debugfs_create(struct amdgpu_device *adev,
> >               struct ras_fs_if *head)
> >  {
> >       struct amdgpu_ras *con = amdgpu_ras_get_context(adev); @@ -1189,7
> > +1189,6 @@ void amdgpu_ras_debugfs_create(struct amdgpu_device *adev,
> >
> >  void amdgpu_ras_debugfs_create_all(struct amdgpu_device *adev)  { -#if
> > defined(CONFIG_DEBUG_FS)
> >       struct amdgpu_ras *con = amdgpu_ras_get_context(adev);
> >       struct ras_manager *obj;
> >       struct ras_fs_if fs_info;
> > @@ -1198,7 +1197,7 @@ void amdgpu_ras_debugfs_create_all(struct
> > amdgpu_device *adev)
> >        * it won't be called in resume path, no need to check
> >        * suspend and gpu reset status
> >        */
> > -     if (!con)
> > +     if (!IS_ENABLED(CONFIG_DEBUG_FS) || !con)
> >               return;
> >
> >       amdgpu_ras_debugfs_create_ctrl_node(adev);
> > @@ -1212,10 +1211,9 @@ void amdgpu_ras_debugfs_create_all(struct
> > amdgpu_device *adev)
> >                       amdgpu_ras_debugfs_create(adev, &fs_info);
> >               }
> >       }
> > -#endif
> >  }
> >
> > -void amdgpu_ras_debugfs_remove(struct amdgpu_device *adev,
> > +static void amdgpu_ras_debugfs_remove(struct amdgpu_device *adev,
> >               struct ras_common_if *head)
> >  {
> >       struct ras_manager *obj = amdgpu_ras_find_obj(adev, head); @@ -
> > 1229,7 +1227,6 @@ void amdgpu_ras_debugfs_remove(struct amdgpu_device
> > *adev,
> >
> >  static void amdgpu_ras_debugfs_remove_all(struct amdgpu_device *adev)  { -
> > #if defined(CONFIG_DEBUG_FS)
> >       struct amdgpu_ras *con = amdgpu_ras_get_context(adev);
> >       struct ras_manager *obj, *tmp;
> >
> > @@ -1238,7 +1235,6 @@ static void amdgpu_ras_debugfs_remove_all(struct
> > amdgpu_device *adev)
> >       }
> >
> >       con->dir = NULL;
> > -#endif
> >  }
> >  /* debugfs end */
> >
> > @@ -1286,7 +1282,8 @@ static int amdgpu_ras_fs_init(struct amdgpu_device
> > *adev)
> >
> >  static int amdgpu_ras_fs_fini(struct amdgpu_device *adev)  {
> > -     amdgpu_ras_debugfs_remove_all(adev);
> > +     if (IS_ENABLED(CONFIG_DEBUG_FS))
> > +             amdgpu_ras_debugfs_remove_all(adev);
> >       amdgpu_ras_sysfs_remove_all(adev);
> >       return 0;
> >  }
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
> > index 4667cce38582..762f5e46c007 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
> > @@ -592,14 +592,8 @@ int amdgpu_ras_sysfs_create(struct amdgpu_device
> > *adev,  int amdgpu_ras_sysfs_remove(struct amdgpu_device *adev,
> >               struct ras_common_if *head);
> >
> > -void amdgpu_ras_debugfs_create(struct amdgpu_device *adev,
> > -             struct ras_fs_if *head);
> > -
> >  void amdgpu_ras_debugfs_create_all(struct amdgpu_device *adev);
> >
> > -void amdgpu_ras_debugfs_remove(struct amdgpu_device *adev,
> > -             struct ras_common_if *head);
> > -
> >  int amdgpu_ras_error_query(struct amdgpu_device *adev,
> >               struct ras_query_if *info);
> >
> > --
> > 2.27.0
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel