From: Thomas Zimmermann <tzimmermann@suse•de>
To: Mark Brown <broonie@kernel•org>, Alex Deucher <alexdeucher@gmail•com>
Cc: Alex Deucher <alexander.deucher@amd•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the drm-misc tree with the amdgpu tree
Date: Mon, 9 Mar 2026 15:37:38 +0100 [thread overview]
Message-ID: <3ff83209-913d-47f3-9939-98f1a2535c04@suse.de> (raw)
In-Reply-To: <aa7alzO1DPSnmSIs@sirena.org.uk>
Hi
Am 09.03.26 um 15:35 schrieb Mark Brown:
> Hi all,
>
> Today's linux-next merge of the amdgpu tree got a conflict in:
>
> include/drm/drm_fb_helper.h
>
> between commit:
>
> 1837c76b780a4 ("drm/amdgpu: Move test for fbdev GEM object into generic helper")
>
> from the amdgpu tree and commit:
>
> 6d438685340df ("drm/fbdev-emulation: Remove empty placeholders")
>
> from the amdgpu tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> diff --cc include/drm/drm_fb_helper.h
> index 15274b8a1d978,ca214b5c02833..0000000000000
> --- a/include/drm/drm_fb_helper.h
> +++ b/include/drm/drm_fb_helper.h
> @@@ -271,6 -271,119 +271,8 @@@ int drm_fb_helper_ioctl(struct fb_info
>
> 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;
> -}
You need exactly this part of the #else branch.
Best regards
Thomas
> -
> -static inline void drm_fb_helper_prepare(struct drm_device *dev,
> - struct drm_fb_helper *helper,
> - unsigned int preferred_bpp,
> - const struct drm_fb_helper_funcs *funcs)
> -{
> -}
> -
> -static inline void drm_fb_helper_unprepare(struct drm_fb_helper *fb_helper)
> -{
> -}
> -
> -static inline int drm_fb_helper_init(struct drm_device *dev,
> - struct drm_fb_helper *helper)
> -{
> - /* So drivers can use it to free the struct */
> - helper->dev = dev;
> - dev->fb_helper = helper;
> -
> - return 0;
> -}
> -
> -static inline void drm_fb_helper_fini(struct drm_fb_helper *helper)
> -{
> - if (helper && helper->dev)
> - helper->dev->fb_helper = NULL;
> -}
> -
> -static inline int drm_fb_helper_blank(int blank, struct fb_info *info)
> -{
> - return 0;
> -}
> -
> -static inline int drm_fb_helper_pan_display(struct fb_var_screeninfo *var,
> - struct fb_info *info)
> -{
> - return 0;
> -}
> -
> -static inline int drm_fb_helper_set_par(struct fb_info *info)
> -{
> - return 0;
> -}
> -
> -static inline int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
> - struct fb_info *info)
> -{
> - return 0;
> -}
> -
> -static inline int
> -drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper)
> -{
> - return 0;
> -}
> -
> -static inline void drm_fb_helper_unregister_info(struct drm_fb_helper *fb_helper)
> -{
> -}
> -
> -static inline void
> -drm_fb_helper_fill_info(struct fb_info *info,
> - struct drm_fb_helper *fb_helper,
> - struct drm_fb_helper_surface_size *sizes)
> -{
> -}
> -
> -static inline int drm_fb_helper_setcmap(struct fb_cmap *cmap,
> - struct fb_info *info)
> -{
> - return 0;
> -}
> -
> -static inline int drm_fb_helper_ioctl(struct fb_info *info, unsigned int cmd,
> - unsigned long arg)
> -{
> - 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)
> -{
> -}
> -
> -static inline void
> -drm_fb_helper_set_suspend_unlocked(struct drm_fb_helper *fb_helper, bool suspend)
> -{
> -}
> -
> -static inline int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper)
> -{
> - return 0;
> -}
> -
> -static inline int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper)
> -{
> - return 0;
> -}
> #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)
next prev parent reply other threads:[~2026-03-09 14:37 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-09 14:35 linux-next: manual merge of the drm-misc tree with the amdgpu tree Mark Brown
2026-03-09 14:37 ` Thomas Zimmermann [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-11-03 3:21 Stephen Rothwell
2020-11-09 2:16 ` Stephen Rothwell
2020-10-28 1:06 Stephen Rothwell
2020-11-05 0:39 ` Stephen Rothwell
2020-08-26 0:18 Stephen Rothwell
2020-09-03 7:06 ` Stephen Rothwell
2019-10-28 2:24 Stephen Rothwell
2019-08-07 3:09 Stephen Rothwell
2019-06-12 1:46 Stephen Rothwell
2019-06-17 3:25 ` Stephen Rothwell
2019-05-21 0:38 Stephen Rothwell
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=3ff83209-913d-47f3-9939-98f1a2535c04@suse.de \
--to=tzimmermann@suse$(echo .)de \
--cc=alexander.deucher@amd$(echo .)com \
--cc=alexdeucher@gmail$(echo .)com \
--cc=broonie@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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