The signature of drm_fb_helper_restore_fbdev_mode_unlocked() was modified
in commit 943240d342f14 ("drm/client: Pass force parameter to client
restore") to add a force parameter, but this was not added to the stub
equivalent for when CONFIG_DRM_FBDEV_EMULATION is not enabled.

Suggested-by: Karolis Mituzas <karolis.mituzas@imgtec.com>
Fixes: 943240d342f14 ("drm/client: Pass force parameter to client restore")
Signed-off-by: Matt Coster <matt.coster@imgtec.com>
---
 include/drm/drm_fb_helper.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
index dd9a18f8de5a7..eebb36a099698 100644
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
@@ -333,7 +333,8 @@ static inline int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
 }
 
 static inline int
-drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper)
+drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper,
+					  bool force)
 {
 	return 0;
 }

---
base-commit: b91a565ed14fcf900b4d95e86882b4b763860986
change-id: 20260114-drm-fb-helper-stub-fix-03f07bd2be61

Hi

Am 14.01.26 um 15:57 schrieb Matt Coster:
> The signature of drm_fb_helper_restore_fbdev_mode_unlocked() was modified
> in commit 943240d342f14 ("drm/client: Pass force parameter to client
> restore") to add a force parameter, but this was not added to the stub
> equivalent for when CONFIG_DRM_FBDEV_EMULATION is not enabled.

The only caller depends on CONFIG_DRM_FBDEV_EMULATION, so the stub 
should never be called. If possible, remove it entirely.

Most of these stub functions are left overs from when fbdev emulation 
was less well isolated from the rest of DRM.

Best regards
Thomas

>
> Suggested-by: Karolis Mituzas <karolis.mituzas@imgtec.com>
> Fixes: 943240d342f14 ("drm/client: Pass force parameter to client restore")
> Signed-off-by: Matt Coster <matt.coster@imgtec.com>
> ---
>   include/drm/drm_fb_helper.h | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
> index dd9a18f8de5a7..eebb36a099698 100644
> --- a/include/drm/drm_fb_helper.h
> +++ b/include/drm/drm_fb_helper.h
> @@ -333,7 +333,8 @@ static inline int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
>   }
>   
>   static inline int
> -drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper)
> +drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper,
> +					  bool force)
>   {
>   	return 0;
>   }
>
> ---
> base-commit: b91a565ed14fcf900b4d95e86882b4b763860986
> change-id: 20260114-drm-fb-helper-stub-fix-03f07bd2be61
>

-- 
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com
GF: Jochen Jaser, Andrew McDonald, Werner Knoblich, (HRB 36809, AG Nürnberg)