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

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

Today's linux-next merge of the drm-misc tree got a conflict in:

  drivers/gpu/drm/drm_fbdev_generic.c

between commits:

  cc88ad784e42 ("drm/fb-helper: Check fb_deferred_io_init() return value")
  d6591da5f3ff ("drm/fb-helper: Use a per-driver FB deferred I/O handler")

from the drm-misc-fixes tree and commit:

  6ca80b9e5cc0 ("drm/fbdev-generic: Rename struct fb_info 'fbi' to 'info'")

from the drm-misc 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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/drm_fbdev_generic.c
index bd1f8f28297c,43f94aa9e015..000000000000
--- a/drivers/gpu/drm/drm_fbdev_generic.c
+++ b/drivers/gpu/drm/drm_fbdev_generic.c
@@@ -200,31 -189,25 +184,31 @@@ static int drm_fbdev_fb_probe(struct dr
  	fb_helper->fb = buffer->fb;
  	fb = buffer->fb;
  
- 	fbi = drm_fb_helper_alloc_info(fb_helper);
- 	if (IS_ERR(fbi))
- 		return PTR_ERR(fbi);
+ 	info = drm_fb_helper_alloc_info(fb_helper);
+ 	if (IS_ERR(info))
+ 		return PTR_ERR(info);
  
- 	fbi->fbops = &drm_fbdev_fb_ops;
- 	fbi->screen_size = sizes->surface_height * fb->pitches[0];
- 	fbi->fix.smem_len = fbi->screen_size;
- 	fbi->flags = FBINFO_DEFAULT;
+ 	info->fbops = &drm_fbdev_fb_ops;
+ 	info->screen_size = sizes->surface_height * fb->pitches[0];
+ 	info->fix.smem_len = info->screen_size;
+ 	info->flags = FBINFO_DEFAULT;
  
- 	drm_fb_helper_fill_info(fbi, fb_helper, sizes);
+ 	drm_fb_helper_fill_info(info, fb_helper, sizes);
  
  	if (drm_fbdev_use_shadow_fb(fb_helper)) {
- 		fbi->screen_buffer = vzalloc(fbi->screen_size);
- 		if (!fbi->screen_buffer)
+ 		info->screen_buffer = vzalloc(info->screen_size);
+ 		if (!info->screen_buffer)
  			return -ENOMEM;
- 		fbi->flags |= FBINFO_VIRTFB | FBINFO_READS_FAST;
+ 		info->flags |= FBINFO_VIRTFB | FBINFO_READS_FAST;
  
 -		info->fbdefio = &drm_fbdev_defio;
 -		fb_deferred_io_init(info);
 +		/* Set a default deferred I/O handler */
 +		fb_helper->fbdefio.delay = HZ / 20;
 +		fb_helper->fbdefio.deferred_io = drm_fb_helper_deferred_io;
 +
- 		fbi->fbdefio = &fb_helper->fbdefio;
- 		ret = fb_deferred_io_init(fbi);
++		info->fbdefio = &fb_helper->fbdefio;
++		ret = fb_deferred_io_init(info);
 +		if (ret)
 +			return ret;
  	} else {
  		/* buffer is mapped for HW framebuffer */
  		ret = drm_client_buffer_vmap(fb_helper->buffer, &map);

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