Messages in this thread | | | Date | Fri, 16 Jun 2023 12:17:50 +0100 | Subject | Re: [PATCH] drm/i915: make i915_drm_client_fdinfo() reference conditional again | From | Tvrtko Ursulin <> |
| |
On 16/06/2023 11:16, Andi Shyti wrote: > Hi Arnd, > > On Fri, Jun 16, 2023 at 11:31:47AM +0200, Arnd Bergmann wrote: >> From: Arnd Bergmann <arnd@arndb.de> >> >> The function is only defined if CONFIG_PROC_FS is enabled: >> >> ld.lld: error: undefined symbol: i915_drm_client_fdinfo >>>>> referenced by i915_driver.c >>>>> drivers/gpu/drm/i915/i915_driver.o:(i915_drm_driver) in archive vmlinux.a >> >> Use the PTR_IF() helper to make the reference NULL otherwise. >> >> Fixes: e894b724c316d ("drm/i915: Use the fdinfo helper") >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> >> --- >> drivers/gpu/drm/i915/i915_driver.c | 2 +- >> drivers/gpu/drm/i915/i915_drm_client.h | 2 -- >> 2 files changed, 1 insertion(+), 3 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c >> index 75cbc43b326dd..0ad0c5885ec27 100644 >> --- a/drivers/gpu/drm/i915/i915_driver.c >> +++ b/drivers/gpu/drm/i915/i915_driver.c >> @@ -1816,7 +1816,7 @@ static const struct drm_driver i915_drm_driver = { >> .open = i915_driver_open, >> .lastclose = i915_driver_lastclose, >> .postclose = i915_driver_postclose, >> - .show_fdinfo = i915_drm_client_fdinfo, >> + .show_fdinfo = PTR_IF(IS_ENABLED(CONFIG_PROC_FS), i915_drm_client_fdinfo), >> >> .prime_handle_to_fd = drm_gem_prime_handle_to_fd, >> .prime_fd_to_handle = drm_gem_prime_fd_to_handle, >> diff --git a/drivers/gpu/drm/i915/i915_drm_client.h b/drivers/gpu/drm/i915/i915_drm_client.h >> index 4c18b99e10a4e..67816c912bca1 100644 >> --- a/drivers/gpu/drm/i915/i915_drm_client.h >> +++ b/drivers/gpu/drm/i915/i915_drm_client.h >> @@ -47,8 +47,6 @@ static inline void i915_drm_client_put(struct i915_drm_client *client) >> >> struct i915_drm_client *i915_drm_client_alloc(void); >> >> -#ifdef CONFIG_PROC_FS >> void i915_drm_client_fdinfo(struct drm_printer *p, struct drm_file *file); >> -#endif > > nice! This is becoming the new trend now. > > Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Thanks for the fix and review! (And I got to learn about existence of PTR_IF too.)
Andi will you merge once green or should I?
Regards,
Tvrtko
| |