From patchwork Mon Jan 14 23:46:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 10763615 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8DA6991E for ; Mon, 14 Jan 2019 23:46:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7AE322C12D for ; Mon, 14 Jan 2019 23:46:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D49D2C162; Mon, 14 Jan 2019 23:46:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BA7462C12D for ; Mon, 14 Jan 2019 23:46:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 125F56E4BD; Mon, 14 Jan 2019 23:46:27 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9A4266E4BD for ; Mon, 14 Jan 2019 23:46:25 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 43dqqc3733z9sCs; Tue, 15 Jan 2019 10:46:20 +1100 (AEDT) Date: Tue, 15 Jan 2019 10:46:19 +1100 From: Stephen Rothwell To: Liviu Dudau , Dave Airlie , DRI Subject: linux-next: build failure after merge of the mali-dp tree Message-ID: <20190115104619.516be4b9@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Boris Brezillon , Linux Next Mailing List , "James Qian Wang \(Arm Technology China\)" , Linux Kernel Mailing List Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 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 --- 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;