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

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

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

Hi all,

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

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

between commit:

  e12e5263bf1d ("drm/msm/dpu: clean up some impossibilities")

from Linus' tree and commit:

  351f950db4ab ("drm/atomic: Pass the full state to CRTC atomic enable/disable")

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/msm/disp/dpu1/dpu_crtc.c
index f56414a06ec4,5ba9b49dfa7a..000000000000
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@@ -706,10 -753,12 +707,12 @@@ static struct drm_crtc_state *dpu_crtc_
  }
  
  static void dpu_crtc_disable(struct drm_crtc *crtc,
- 			     struct drm_crtc_state *old_crtc_state)
+ 			     struct drm_atomic_state *state)
  {
+ 	struct drm_crtc_state *old_crtc_state = drm_atomic_get_old_crtc_state(state,
+ 									      crtc);
 -	struct dpu_crtc *dpu_crtc;
 -	struct dpu_crtc_state *cstate;
 +	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
 +	struct dpu_crtc_state *cstate = to_dpu_crtc_state(crtc->state);
  	struct drm_encoder *encoder;
  	unsigned long flags;
  	bool release_bandwidth = false;
@@@ -770,9 -826,9 +773,9 @@@
  }
  
  static void dpu_crtc_enable(struct drm_crtc *crtc,
- 		struct drm_crtc_state *old_crtc_state)
+ 		struct drm_atomic_state *state)
  {
 -	struct dpu_crtc *dpu_crtc;
 +	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
  	struct drm_encoder *encoder;
  	bool request_bandwidth = false;
  

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