Subject: linux-next: manual merge of the drm tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 21 Dec 2011 14:18:01 +1100

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c between commit e7ac9211f29f ("vmwgfx:
Refactor kms code to use vmw_user_lookup_handle helper") from Linus' tree
and commit 308e5bcbdb10 ("drm: add an fb creation ioctl that takes a
pixel format v5") from the drm tree.

I fixed it up (I think - see below) and can carry the fix as necessary.

Dave, you might like to merge the branch you sent to Linus into your
drm-next branch to fix this up.

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index 8aa1dbb,1748a71..0000000
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@@ -1123,29 -1041,46 +1131,29 @@@ static struct drm_framebuffer *vmw_kms_
  		return ERR_PTR(-ENOENT);
  	}
  
 -	/**
 -	 * End conditioned code.
 -	 */
 -
 -	ret = vmw_user_surface_lookup_handle(dev_priv, tfile,
 -					     mode_cmd.handle, &surface);
 +	/* returns either a dmabuf or surface */
 +	ret = vmw_user_lookup_handle(dev_priv, tfile,
- 				     mode_cmd->handle,
++				     mode_cmd.handle,
 +				     &surface, &bo);
  	if (ret)
 -		goto try_dmabuf;
 -
 -	if (!surface->scanout)
 -		goto err_not_scanout;
 -
 -	ret = vmw_kms_new_framebuffer_surface(dev_priv, file_priv, surface,
 -					      &vfb, &mode_cmd);
 -
 -	/* vmw_user_surface_lookup takes one ref so does new_fb */
 -	vmw_surface_unreference(&surface);
 -
 -	if (ret) {
 -		DRM_ERROR("failed to create vmw_framebuffer: %i\n", ret);
 -		ttm_base_object_unref(&user_obj);
 -		return ERR_PTR(ret);
 -	} else
 -		vfb->user_obj = user_obj;
 -	return &vfb->base;
 -
 -try_dmabuf:
 -	DRM_INFO("%s: trying buffer\n", __func__);
 -
 -	ret = vmw_user_dmabuf_lookup(tfile, mode_cmd.handle, &bo);
 -	if (ret) {
 -		DRM_ERROR("failed to find buffer: %i\n", ret);
 -		return ERR_PTR(-ENOENT);
 -	}
 -
 -	ret = vmw_kms_new_framebuffer_dmabuf(dev_priv, bo, &vfb,
 -					     &mode_cmd);
 -
 -	/* vmw_user_dmabuf_lookup takes one ref so does new_fb */
 -	vmw_dmabuf_unreference(&bo);
 +		goto err_out;
 +
 +	/* Create the new framebuffer depending one what we got back */
 +	if (bo)
 +		ret = vmw_kms_new_framebuffer_dmabuf(dev_priv, bo, &vfb,
- 						     mode_cmd);
++						     &mode_cmd);
 +	else if (surface)
 +		ret = vmw_kms_new_framebuffer_surface(dev_priv, file_priv,
- 						      surface, &vfb, mode_cmd);
++						      surface, &vfb, &mode_cmd);
 +	else
 +		BUG();
 +
 +err_out:
 +	/* vmw_user_lookup_handle takes one ref so does new_fb */
 +	if (bo)
 +		vmw_dmabuf_unreference(&bo);
 +	if (surface)
 +		vmw_surface_unreference(&surface);
  
  	if (ret) {
  		DRM_ERROR("failed to create vmw_framebuffer: %i\n", ret);