From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Liviu Dudau <Liviu.Dudau@arm.com>, Dave Airlie <airlied@linux.ie>,
DRI <dri-devel@lists.freedesktop.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Rob Clark <robdclark@gmail.com>,
Boris Brezillon <boris.brezillon@bootlin.com>,
"James Qian Wang (Arm Technology China)"
<james.qian.wang@arm.com>
Subject: linux-next: build failure after merge of the mali-dp tree
Date: Tue, 15 Jan 2019 10:46:19 +1100 [thread overview]
Message-ID: <20190115104619.516be4b9@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 4279 bytes --]
Hi Liviu,
After merging the mali-dp tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c: In function 'komeda_pipeline_obj_add':
drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c:48:30: error: passing argument 1 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
drm_atomic_private_obj_init(&pipe->obj, &st->obj,
^~~~~~~~~~
In file included from drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h:11,
from drivers/gpu/drm/arm/display/komeda/komeda_dev.h:12,
from drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c:7:
include/drm/drm_atomic.h:437:53: note: expected 'struct drm_device *' but argument is of type 'struct drm_private_obj *'
void drm_atomic_private_obj_init(struct drm_device *dev,
~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c:48:42: error: passing argument 2 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
drm_atomic_private_obj_init(&pipe->obj, &st->obj,
^~~~~~~~
In file included from drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h:11,
from drivers/gpu/drm/arm/display/komeda/komeda_dev.h:12,
from drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c:7:
include/drm/drm_atomic.h:438:30: note: expected 'struct drm_private_obj *' but argument is of type 'struct drm_private_state *'
struct drm_private_obj *obj,
~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c:49:9: error: passing argument 3 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
&komeda_pipeline_obj_funcs);
^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h:11,
from drivers/gpu/drm/arm/display/komeda/komeda_dev.h:12,
from drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c:7:
include/drm/drm_atomic.h:439:32: note: expected 'struct drm_private_state *' but argument is of type 'const struct drm_private_state_funcs *'
struct drm_private_state *state,
~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c:48:2: error: too few arguments to function 'drm_atomic_private_obj_init'
drm_atomic_private_obj_init(&pipe->obj, &st->obj,
^~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h:11,
from drivers/gpu/drm/arm/display/komeda/komeda_dev.h:12,
from drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c:7:
include/drm/drm_atomic.h:437:6: note: declared here
void drm_atomic_private_obj_init(struct drm_device *dev,
^~~~~~~~~~~~~~~~~~~~~~~~~~~
Caused by commit
61f1c4a8ab75 ("drm/komeda: Attach komeda_dev to DRM-KMS")
interacting with commit
b962a12050a3 ("drm/atomic: integrate modeset lock with private objects")
from the drm tree.
I have applied the following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 15 Jan 2019 10:42:04 +1100
Subject: [PATCH] drm/komeda: merge fix for drm_atomic_private_obj_init() API change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c b/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c
index 9edfd6ab0c12..f1c9e3fefa86 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c
@@ -45,7 +45,7 @@ static int komeda_pipeline_obj_add(struct komeda_kms_dev *kms,
return -ENOMEM;
st->pipe = pipe;
- drm_atomic_private_obj_init(&pipe->obj, &st->obj,
+ drm_atomic_private_obj_init(&kms->base, &pipe->obj, &st->obj,
&komeda_pipeline_obj_funcs);
return 0;
--
2.20.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-01-14 23:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-14 23:46 Stephen Rothwell [this message]
2019-01-15 10:12 ` linux-next: build failure after merge of the mali-dp tree Liviu Dudau
2019-01-15 10:47 ` Stephen Rothwell
2019-01-15 10:51 ` Liviu Dudau
2019-01-15 12:08 ` Daniel Vetter
2019-01-15 12:23 ` Liviu Dudau
2019-01-15 13:37 ` Daniel Vetter
-- strict thread matches above, loose matches on Subject: below --
2019-01-14 1:21 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=20190115104619.516be4b9@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Liviu.Dudau@arm.com \
--cc=airlied@linux.ie \
--cc=boris.brezillon@bootlin.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=james.qian.wang@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robdclark@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).