linux-next: manual merge of the drm-msm-lumag tree with the drm-msm tree

[Stephen Rothwell]

Hi all,

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

  drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c

between commit:

  52ff0d3073d2 ("drm/msm/atomic: Switch to vblank_start helper")

from the drm-msm tree and commit:

  f4d83f101233 ("drm/msm/dpu: Remove empty prepare_commit() function")

from the drm-msm-lumag 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/msm/disp/dpu1/dpu_kms.c
index 6cd7be500dfe,6944c1315085..000000000000
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@@ -411,26 -429,20 +429,6 @@@ static void dpu_kms_disable_commit(stru
  	pm_runtime_put_sync(&dpu_kms->pdev->dev);
  }
  
- static void dpu_kms_prepare_commit(struct msm_kms *kms,
- 		struct drm_atomic_state *state)
 -static ktime_t dpu_kms_vsync_time(struct msm_kms *kms, struct drm_crtc *crtc)
--{
- 	struct drm_crtc *crtc;
- 	struct drm_crtc_state *crtc_state;
--	struct drm_encoder *encoder;
- 	int i;
--
- 	if (!kms)
- 		return;
 -	drm_for_each_encoder_mask(encoder, crtc->dev, crtc->state->encoder_mask) {
 -		ktime_t vsync_time;
--
- 	/* Call prepare_commit for all affected encoders */
- 	for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
- 		drm_for_each_encoder_mask(encoder, crtc->dev,
- 					  crtc_state->encoder_mask) {
- 			dpu_encoder_prepare_commit(encoder);
- 		}
 -		if (dpu_encoder_vsync_time(encoder, &vsync_time) == 0)
 -			return vsync_time;
--	}
 -
 -	return ktime_get();
--}
--
  static void dpu_kms_flush_commit(struct msm_kms *kms, unsigned crtc_mask)
  {
  	struct dpu_kms *dpu_kms = to_dpu_kms(kms);
@@@ -939,7 -951,7 +937,6 @@@ static const struct msm_kms_funcs kms_f
  	.irq             = dpu_core_irq,
  	.enable_commit   = dpu_kms_enable_commit,
  	.disable_commit  = dpu_kms_disable_commit,
- 	.prepare_commit  = dpu_kms_prepare_commit,
 -	.vsync_time      = dpu_kms_vsync_time,
  	.flush_commit    = dpu_kms_flush_commit,
  	.wait_flush      = dpu_kms_wait_flush,
  	.complete_commit = dpu_kms_complete_commit,

Attachment: pgpsKaQYoieXL.pgp
Description: OpenPGP digital signature