[PATCH] [linux-next mismerge] drm/fbdev-emulation: restore drm_fb_helper_gem_is_fb() dummy

[Arnd Bergmann <arnd@kernel.org>]

From: Arnd Bergmann <arnd@arndb.de>

linux-next contains an incorrect merge of the drm tree and the amdgpu tree,
which have conflicting patches from Thomas Zimmermann:

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c: In function 'amdgpu_display_suspend_helper':
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c:1777:22: error: implicit declaration of function 'drm_fb_helper_gem_is_fb'; did you mean 'drm_fb_helper_from_client'? [-Wimplicit-function-declaration]
 1777 |                 if (!drm_fb_helper_gem_is_fb(dev->fb_helper, fb->obj[0])) {

drivers/gpu/drm/radeon/radeon_device.c: In function 'radeon_suspend_kms':
drivers/gpu/drm/radeon/radeon_device.c:1592:22: error: implicit declaration of function 'drm_fb_helper_gem_is_fb'; did you mean 'drm_fb_helper_from_client'? [-Wimplicit-function-declaration]
 1592 |                 if (!drm_fb_helper_gem_is_fb(dev->fb_helper, fb->obj[0])) {
      |                      ^~~~~~~~~~~~~~~~~~~~~~~
      |                      drm_fb_helper_from_client

The newly added drm_fb_helper_from_client() stub is in fact needed, while all
the other stubs are correctly removed.

Fixes: 6d438685340d ("drm/fbdev-emulation: Remove empty placeholders")
Fixes: 1837c76b780a ("drm/amdgpu: Move test for fbdev GEM object into generic helper")
Fixes: 9c63d743d5cc ("Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux.git")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 include/drm/drm_fb_helper.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
index bf391903443d..80c81fdb04a2 100644
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
@@ -273,6 +273,14 @@ int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper);
 int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper);
 bool drm_fb_helper_gem_is_fb(const struct drm_fb_helper *fb_helper,
 			     const struct drm_gem_object *obj);
+#else
+static inline bool
+drm_fb_helper_gem_is_fb(const struct drm_fb_helper *fb_helper,
+			const struct drm_gem_object *obj)
+{
+	return false;
+}
+
 #endif
 
 #endif
-- 
2.39.5