On Thu, Apr 24, 2025 at 07:40:34PM +0100, Adrián Larumbe wrote: > Commit a3707f53eb3f ("drm/panthor: show device-wide list of DRM GEM > objects over DebugFS") causes a build warning and linking error when > built without support for DebugFS, because of a non-inline non-static > function declaration in a header file. > > On top of that, the function is only being used inside a single > compilation unit, so there is no point in exposing it as a global > symbol. > > This is a follow-up from Arnd Bergmann's first fix. > Also move panthor_gem_debugfs_set_usage_flags() into panthor_gem.c and > declare it static. > > Fixes: a3707f53eb3f ("drm/panthor: show device-wide list of DRM GEM objects > over DebugFS") > Reported-by: Arnd Bergmann <a...@arndb.de> > Closes: > https://lore.kernel.org/dri-devel/20250424142419.47b9d...@collabora.com/T/#t > Signed-off-by: Adrián Larumbe <adrian.laru...@collabora.com>
Reviewed-by: Liviu Dudau <liviu.du...@arm.com> Best regards, Liviu > --- > drivers/gpu/drm/panthor/panthor_gem.c | 5 +++++ > drivers/gpu/drm/panthor/panthor_gem.h | 8 -------- > 2 files changed, 5 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/panthor/panthor_gem.c > b/drivers/gpu/drm/panthor/panthor_gem.c > index 2dcf308094b2..7c00fd77758b 100644 > --- a/drivers/gpu/drm/panthor/panthor_gem.c > +++ b/drivers/gpu/drm/panthor/panthor_gem.c > @@ -42,11 +42,16 @@ static void panthor_gem_debugfs_bo_rm(struct > panthor_gem_object *bo) > mutex_unlock(&ptdev->gems.lock); > } > > +static void panthor_gem_debugfs_set_usage_flags(struct panthor_gem_object > *bo, u32 usage_flags) > +{ > + bo->debugfs.flags = usage_flags | > PANTHOR_DEBUGFS_GEM_USAGE_FLAG_INITIALIZED; > +} > #else > static void panthor_gem_debugfs_bo_add(struct panthor_device *ptdev, > struct panthor_gem_object *bo) > {} > static void panthor_gem_debugfs_bo_rm(struct panthor_gem_object *bo) {} > +static void panthor_gem_debugfs_set_usage_flags(struct panthor_gem_object > *bo, u32 usage_flags) {} > #endif > > static void panthor_gem_free_object(struct drm_gem_object *obj) > diff --git a/drivers/gpu/drm/panthor/panthor_gem.h > b/drivers/gpu/drm/panthor/panthor_gem.h > index 4641994ddd7f..4dd732dcd59f 100644 > --- a/drivers/gpu/drm/panthor/panthor_gem.h > +++ b/drivers/gpu/drm/panthor/panthor_gem.h > @@ -212,14 +212,6 @@ void panthor_kernel_bo_destroy(struct panthor_kernel_bo > *bo); > #ifdef CONFIG_DEBUG_FS > void panthor_gem_debugfs_print_bos(struct panthor_device *pfdev, > struct seq_file *m); > -static inline void > -panthor_gem_debugfs_set_usage_flags(struct panthor_gem_object *bo, u32 > usage_flags) > -{ > - bo->debugfs.flags = usage_flags | > PANTHOR_DEBUGFS_GEM_USAGE_FLAG_INITIALIZED; > -} > - > -#else > -void panthor_gem_debugfs_set_usage_flags(struct panthor_gem_object *bo, u32 > usage_flags) {}; > #endif > > #endif /* __PANTHOR_GEM_H__ */ > > base-commit: 3a2b7389feea9a7afd18d58cda59b7a989445f38 > -- > 2.48.1 > -- ==================== | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- ¯\_(ツ)_/¯