From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rob Clark <robdclark@gmail•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Ville Syrjälä" <ville.syrjala@linux•intel.com>,
"Vinay Simha BN" <vinaysimha@inforcecomputing•com>
Subject: linux-next: build failure after merge of the drm-msm tree
Date: Tue, 15 Dec 2015 12:27:21 +1100 [thread overview]
Message-ID: <20151215122721.08ff1448@canb.auug.org.au> (raw)
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 <sfr@canb•auug.org.au>
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 <sfr@canb•auug.org.au>
---
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 sfr@canb•auug.org.au
next reply other threads:[~2015-12-15 1:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-15 1:27 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-07-11 3:20 linux-next: build failure after merge of the drm-msm tree Stephen Rothwell
2018-06-04 3:20 Stephen Rothwell
2018-07-23 4:50 Stephen Rothwell
2018-07-25 12:08 ` Rob Clark
2018-10-05 1:37 Stephen Rothwell
2021-06-18 2:42 Stephen Rothwell
2021-06-18 2:50 ` Stephen Rothwell
2021-06-23 1:02 ` Stephen Rothwell
2021-07-29 11:28 Mark Brown
2022-05-05 1:43 Stephen Rothwell
2022-05-05 1:48 Stephen Rothwell
2023-10-10 1:54 Stephen Rothwell
2023-12-11 0:59 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151215122721.08ff1448@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robdclark@gmail$(echo .)com \
--cc=ville.syrjala@linux$(echo .)intel.com \
--cc=vinaysimha@inforcecomputing$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox