| Message ID | 20241021-fix-drm-deferred-v2-1-db1de4c6b042@linaro.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] drm/fbdev: fix drm_fb_helper_deferred_io() build failure | expand |
Am 21.10.24 um 15:37 schrieb Dmitry Baryshkov: > The drm_fb_helper_deferred_io() uses struct fb_deferred_io_pageref, > which isn't available without CONFIG_FB_DEFERRED_IO. Put the function > under corresponding #ifdef to fix build failure if deferred I/O isn't > enabled. > > Fixes: 8058944f5226 ("drm/fbdev: Select fbdev I/O helpers from modules that require them") > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> Thanks a lot. I'll add the fix to drm-misc in a bit. Best regards Thomas > --- > Changes in v2: > - Added guard #ifdef's around function prototype and a stub (Thomas) > - Link to v1: https://lore.kernel.org/r/20241018-fix-drm-deferred-v1-1-c33bf5d209b0@linaro.org > --- > drivers/gpu/drm/drm_fb_helper.c | 2 ++ > include/drm/drm_fb_helper.h | 4 ++++ > 2 files changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > index d5e8994345bb..c9008113111b 100644 > --- a/drivers/gpu/drm/drm_fb_helper.c > +++ b/drivers/gpu/drm/drm_fb_helper.c > @@ -697,6 +697,7 @@ void drm_fb_helper_damage_area(struct fb_info *info, u32 x, u32 y, u32 width, u3 > } > EXPORT_SYMBOL(drm_fb_helper_damage_area); > > +#ifdef CONFIG_FB_DEFERRED_IO > /** > * drm_fb_helper_deferred_io() - fbdev deferred_io callback function > * @info: fb_info struct pointer > @@ -740,6 +741,7 @@ void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagerefli > } > } > EXPORT_SYMBOL(drm_fb_helper_deferred_io); > +#endif > > /** > * drm_fb_helper_set_suspend - wrapper around fb_set_suspend > diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h > index 699f2790b9ac..8426b9921a03 100644 > --- a/include/drm/drm_fb_helper.h > +++ b/include/drm/drm_fb_helper.h > @@ -256,7 +256,9 @@ void drm_fb_helper_fill_info(struct fb_info *info, > void drm_fb_helper_damage_range(struct fb_info *info, off_t off, size_t len); > void drm_fb_helper_damage_area(struct fb_info *info, u32 x, u32 y, u32 width, u32 height); > > +#ifdef CONFIG_FB_DEFERRED_IO > void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagereflist); > +#endif > > void drm_fb_helper_set_suspend(struct drm_fb_helper *fb_helper, bool suspend); > void drm_fb_helper_set_suspend_unlocked(struct drm_fb_helper *fb_helper, > @@ -361,10 +363,12 @@ static inline int drm_fb_helper_ioctl(struct fb_info *info, unsigned int cmd, > return 0; > } > > +#ifdef CONFIG_FB_DEFERRED_IO > static inline void drm_fb_helper_deferred_io(struct fb_info *info, > struct list_head *pagelist) > { > } > +#endif > > static inline void drm_fb_helper_set_suspend(struct drm_fb_helper *fb_helper, > bool suspend) > > --- > base-commit: 2063ca42486bc07b49bc145b5dfcb421f4deebaf > change-id: 20241018-fix-drm-deferred-01c9996c17a6 > > Best regards,
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index d5e8994345bb..c9008113111b 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -697,6 +697,7 @@ void drm_fb_helper_damage_area(struct fb_info *info, u32 x, u32 y, u32 width, u3 } EXPORT_SYMBOL(drm_fb_helper_damage_area); +#ifdef CONFIG_FB_DEFERRED_IO /** * drm_fb_helper_deferred_io() - fbdev deferred_io callback function * @info: fb_info struct pointer @@ -740,6 +741,7 @@ void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagerefli } } EXPORT_SYMBOL(drm_fb_helper_deferred_io); +#endif /** * drm_fb_helper_set_suspend - wrapper around fb_set_suspend diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index 699f2790b9ac..8426b9921a03 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h @@ -256,7 +256,9 @@ void drm_fb_helper_fill_info(struct fb_info *info, void drm_fb_helper_damage_range(struct fb_info *info, off_t off, size_t len); void drm_fb_helper_damage_area(struct fb_info *info, u32 x, u32 y, u32 width, u32 height); +#ifdef CONFIG_FB_DEFERRED_IO void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagereflist); +#endif void drm_fb_helper_set_suspend(struct drm_fb_helper *fb_helper, bool suspend); void drm_fb_helper_set_suspend_unlocked(struct drm_fb_helper *fb_helper, @@ -361,10 +363,12 @@ static inline int drm_fb_helper_ioctl(struct fb_info *info, unsigned int cmd, return 0; } +#ifdef CONFIG_FB_DEFERRED_IO static inline void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagelist) { } +#endif static inline void drm_fb_helper_set_suspend(struct drm_fb_helper *fb_helper, bool suspend)
The drm_fb_helper_deferred_io() uses struct fb_deferred_io_pageref, which isn't available without CONFIG_FB_DEFERRED_IO. Put the function under corresponding #ifdef to fix build failure if deferred I/O isn't enabled. Fixes: 8058944f5226 ("drm/fbdev: Select fbdev I/O helpers from modules that require them") Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- Changes in v2: - Added guard #ifdef's around function prototype and a stub (Thomas) - Link to v1: https://lore.kernel.org/r/20241018-fix-drm-deferred-v1-1-c33bf5d209b0@linaro.org --- drivers/gpu/drm/drm_fb_helper.c | 2 ++ include/drm/drm_fb_helper.h | 4 ++++ 2 files changed, 6 insertions(+) --- base-commit: 2063ca42486bc07b49bc145b5dfcb421f4deebaf change-id: 20241018-fix-drm-deferred-01c9996c17a6 Best regards,