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

From: Stephen Rothwell
Date: Wed Aug 02 2017 - 23:03:09 EST

Hi all,

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


between commits:

0b20a0f8c3cb ("drm: Add old state pointer to CRTC .enable() helper function")
64581714b58b ("drm: Convert atomic drivers from CRTC .disable() to .atomic_disable()")

from the drm tree and commit:

710e7a448783 ("drm/msm/mdp5: Don't use mode_set helper funcs for encoders and CRTCs")

from the drm-msm 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.

Stephen Rothwell

diff --cc drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
index 4322a502555a,aefe6d2cfa94..000000000000
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
@@@ -940,7 -954,8 +956,6 @@@ static const struct drm_crtc_funcs mdp5

static const struct drm_crtc_helper_funcs mdp5_crtc_helper_funcs = {
- .mode_set_nofb = mdp5_crtc_mode_set_nofb,
- .disable = mdp5_crtc_disable,
- .enable = mdp5_crtc_enable,
.atomic_check = mdp5_crtc_atomic_check,
.atomic_begin = mdp5_crtc_atomic_begin,
.atomic_flush = mdp5_crtc_atomic_flush,