Subject: linux-next: build failure after merge of the drm-msm tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 15 Dec 2015 12:27:21 +1100

Hi Rob,

After merging the drm-msm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c: In function 'mdp4_dsi_encoder_init':
drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c:187:2: error: too few arguments to function 'drm_encoder_init'
  drm_encoder_init(dev, encoder, &mdp4_dsi_encoder_funcs,
  ^
In file included from include/drm/drmP.h:68:0,
                 from drivers/gpu/drm/msm/msm_drv.h:37,
                 from drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h:21,
                 from drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c:20:
include/drm/drm_crtc.h:2220:5: note: declared here
 int drm_encoder_init(struct drm_device *dev,
     ^

Caused by commit

  776638e73a19 ("drm/msm/dsi: Add a mdp4 encoder for DSI")

interacting withe commit

  13a3d91f17a5 ("drm: Pass 'name' to drm_encoder_init()")

from the drm-misc tree.

I added the following merge fix patch:

From: Stephen Rothwell <[email-masked]>
Date: Tue, 15 Dec 2015 12:23:41 +1100
Subject: [PATCH] drm/msm/dsi: update for drm_encoder_init() API change

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c
index 49052bb5d2e4..2f57e9453b67 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c
@@ -185,7 +185,7 @@ struct drm_encoder *mdp4_dsi_encoder_init(struct drm_device *dev)
 	encoder = &mdp4_dsi_encoder->base;
 
 	drm_encoder_init(dev, encoder, &mdp4_dsi_encoder_funcs,
-			 DRM_MODE_ENCODER_DSI);
+			 DRM_MODE_ENCODER_DSI, NULL);
 	drm_encoder_helper_add(encoder, &mdp4_dsi_encoder_helper_funcs);
 
 	return encoder;
-- 
2.6.2

-- 
Cheers,
Stephen Rothwell                    [email-masked]