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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 28 Feb 2020 11:21:04 +1100

Hi all,

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

  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

between commits:

  ea702333e567 ("drm/amdgpu: Convert to struct drm_crtc_helper_funcs.get_scanout_position()")
  e3eff4b5d91e ("drm/amdgpu: Convert to CRTC VBLANK callbacks")

from the drm tree and commit:

  c6385e503aea ("drm/amdgpu: drop legacy drm load and unload callbacks")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 4598836c5fa4,4e868229e3b7..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@@ -1377,17 -1434,30 +1434,15 @@@ int amdgpu_file_to_fpriv(struct file *f
  	return 0;
  }
  
 -static bool
 -amdgpu_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe,
 -				 bool in_vblank_irq, int *vpos, int *hpos,
 -				 ktime_t *stime, ktime_t *etime,
 -				 const struct drm_display_mode *mode)
 -{
 -	return amdgpu_display_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos,
 -						  stime, etime, mode);
 -}
 -
  static struct drm_driver kms_driver = {
  	.driver_features =
- 	    DRIVER_USE_AGP | DRIVER_ATOMIC |
+ 	    DRIVER_ATOMIC |
  	    DRIVER_GEM |
  	    DRIVER_RENDER | DRIVER_MODESET | DRIVER_SYNCOBJ |
  	    DRIVER_SYNCOBJ_TIMELINE,
  	.open = amdgpu_driver_open_kms,
  	.postclose = amdgpu_driver_postclose_kms,
  	.lastclose = amdgpu_driver_lastclose_kms,
- 	.unload = amdgpu_driver_unload_kms,
 -	.get_vblank_counter = amdgpu_get_vblank_counter_kms,
 -	.enable_vblank = amdgpu_enable_vblank_kms,
 -	.disable_vblank = amdgpu_disable_vblank_kms,
 -	.get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos,
 -	.get_scanout_position = amdgpu_get_crtc_scanout_position,
  	.irq_handler = amdgpu_irq_handler,
  	.ioctls = amdgpu_ioctls_kms,
  	.gem_free_object_unlocked = amdgpu_gem_object_free,