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

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

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

  drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
  drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
  drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c

between commit:

  8fbf9d92a7bc ("drm/vmwgfx: Implement the cursor_set2 callback v2")

from Linus' tree and commit:

  f80de66eca65 ("drm/vmwgfx: Drop dummy save/restore hooks")

from the drm-misc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
index 52caecb4502e,2aff5e51d926..000000000000
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
@@@ -295,9 -295,7 +295,7 @@@ static int vmw_ldu_crtc_set_config(stru
  }
  
  static struct drm_crtc_funcs vmw_legacy_crtc_funcs = {
- 	.save = vmw_du_crtc_save,
- 	.restore = vmw_du_crtc_restore,
 -	.cursor_set = vmw_du_crtc_cursor_set,
 +	.cursor_set2 = vmw_du_crtc_cursor_set2,
  	.cursor_move = vmw_du_crtc_cursor_move,
  	.gamma_set = vmw_du_crtc_gamma_set,
  	.destroy = vmw_ldu_crtc_destroy,
diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
index 13926ff192e3,6bb7af37934a..000000000000
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
@@@ -531,9 -531,7 +531,7 @@@ out_no_fence
  }
  
  static struct drm_crtc_funcs vmw_screen_object_crtc_funcs = {
- 	.save = vmw_du_crtc_save,
- 	.restore = vmw_du_crtc_restore,
 -	.cursor_set = vmw_du_crtc_cursor_set,
 +	.cursor_set2 = vmw_du_crtc_cursor_set2,
  	.cursor_move = vmw_du_crtc_cursor_move,
  	.gamma_set = vmw_du_crtc_gamma_set,
  	.destroy = vmw_sou_crtc_destroy,
diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
index f823fc3efed7,45e72c2f15cd..000000000000
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
@@@ -1041,9 -1041,7 +1041,7 @@@ out_finish
   *  Screen Target CRTC dispatch table
   */
  static struct drm_crtc_funcs vmw_stdu_crtc_funcs = {
- 	.save = vmw_du_crtc_save,
- 	.restore = vmw_du_crtc_restore,
 -	.cursor_set = vmw_du_crtc_cursor_set,
 +	.cursor_set2 = vmw_du_crtc_cursor_set2,
  	.cursor_move = vmw_du_crtc_cursor_move,
  	.gamma_set = vmw_du_crtc_gamma_set,
  	.destroy = vmw_stdu_crtc_destroy,
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx