From: Thomas Zimmermann <tzimmermann@suse.de>
To: Arnd Bergmann <arnd@kernel.org>, Mark Brown <broonie@kernel.org>
Cc: "Arnd Bergmann" <arnd@arndb.de>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"David Airlie" <airlied@gmail.com>,
"Simona Vetter" <simona@ffwll.ch>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] [linux-next mismerge] drm/fbdev-emulation: restore drm_fb_helper_gem_is_fb() dummy
Date: Mon, 16 Mar 2026 13:17:44 +0100 [thread overview]
Message-ID: <1729c256-5854-4ffd-ab90-730047a47067@suse.de> (raw)
In-Reply-To: <20260313095657.4115599-1-arnd@kernel.org>
Am 13.03.26 um 10:56 schrieb Arnd Bergmann:
> 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>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.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
--
--
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)
prev parent reply other threads:[~2026-03-16 12:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-13 9:56 Arnd Bergmann
2026-03-16 12:17 ` Thomas Zimmermann [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1729c256-5854-4ffd-ab90-730047a47067@suse.de \
--to=tzimmermann@suse.de \
--cc=airlied@gmail.com \
--cc=alexander.deucher@amd.com \
--cc=arnd@arndb.de \
--cc=arnd@kernel.org \
--cc=broonie@kernel.org \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=simona@ffwll.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®