linux-next: manual merge of the drm-misc tree with the amdgpu tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 3863 bytes --]

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;
 -}
 -
 -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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]