From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A90B8C28E83 for ; Wed, 2 Sep 2020 03:06:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7FAE92068F for ; Wed, 2 Sep 2020 03:06:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="S4NyqMv/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726762AbgIBDGf (ORCPT ); Tue, 1 Sep 2020 23:06:35 -0400 Received: from ozlabs.org ([203.11.71.1]:41429 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726406AbgIBDGd (ORCPT ); Tue, 1 Sep 2020 23:06:33 -0400 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 (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Bh83R5Kh2z9sSJ; Wed, 2 Sep 2020 13:06:27 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1599015990; bh=zim69dfuPpB8Yc/TUTIMWuP0ktKGex5mslQ+gJxzaq0=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=S4NyqMv/TQ3NRUoeVx95Jqy8U4YUbFnZDytjI8fpZrDZYqqvSK6kp82n2SQpnRKjt PkBLDzrcz24MU2xUbXqehJgEXy89v5JM9+ETWwuL5ktGRyf078zXDRRwyJyBZ2A6dA 76QM/XUS8aKK+dRL6YKa9GT5P1HNVoA/wZhg+QIO6qeuLM9M8fZs8WUTSvBxIii2oL ajU/FFlGx3EXM3NYTuSDXDCJMq5NzzPPXUQnZ5/dQ+Mbj1pvzdnpZQacD6gtnf9Wwv V/fUpA5CZLX9KEybaCM44/aHaCl482MG7h4BTbpq49hh/6nSHHZRKECudeEFbUWaui 4+OKMjaKkalzg== Date: Wed, 2 Sep 2020 13:06:24 +1000 From: Stephen Rothwell To: Dave Airlie Cc: Daniel Vetter , Intel Graphics , DRI , Linux Next Mailing List , Linux Kernel Mailing List , Gerd Hoffmann , Sidong Yang , Alex Deucher Subject: Re: linux-next: build failure after merge of the drm-misc tree Message-ID: <20200902130624.18983108@canb.auug.org.au> In-Reply-To: <20200826105547.4f6ea26d@canb.auug.org.au> References: <20200826105547.4f6ea26d@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/YizQk8yowqeEyhmG.EVW9OP"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/YizQk8yowqeEyhmG.EVW9OP Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Wed, 26 Aug 2020 10:55:47 +1000 Stephen Rothwell = wrote: > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: >=20 > drivers/gpu/drm/qxl/qxl_display.c: In function 'qxl_display_read_client_m= onitors_config': > include/drm/drm_modeset_lock.h:167:7: error: implicit declaration of func= tion 'drm_drv_uses_atomic_modeset' [-Werror=3Dimplicit-function-declaration] > 167 | if (!drm_drv_uses_atomic_modeset(dev)) \ > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c:187:2: note: in expansion of macro 'DRM= _MODESET_LOCK_ALL_BEGIN' > 187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRU= PTIBLE, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c:189:35: error: macro "DRM_MODESET_LOCK_= ALL_END" requires 3 arguments, but only 2 given > 189 | DRM_MODESET_LOCK_ALL_END(ctx, ret); > | ^ > In file included from include/drm/drm_crtc.h:36, > from include/drm/drm_atomic.h:31, > from drivers/gpu/drm/qxl/qxl_display.c:29: > include/drm/drm_modeset_lock.h:194: note: macro "DRM_MODESET_LOCK_ALL_END= " defined here > 194 | #define DRM_MODESET_LOCK_ALL_END(dev, ctx, ret) \ > |=20 > drivers/gpu/drm/qxl/qxl_display.c:189:2: error: 'DRM_MODESET_LOCK_ALL_END= ' undeclared (first use in this function) > 189 | DRM_MODESET_LOCK_ALL_END(ctx, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c:189:2: note: each undeclared identifier= is reported only once for each function it appears in > drivers/gpu/drm/qxl/qxl_display.c:187:2: error: label 'modeset_lock_fail'= used but not defined > 187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRU= PTIBLE, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > In file included from include/drm/drm_crtc.h:36, > from include/drm/drm_atomic.h:31, > from drivers/gpu/drm/qxl/qxl_display.c:29: > include/drm/drm_modeset_lock.h:170:1: warning: label 'modeset_lock_retry'= defined but not used [-Wunused-label] > 170 | modeset_lock_retry: \ > | ^~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c:187:2: note: in expansion of macro 'DRM= _MODESET_LOCK_ALL_BEGIN' > 187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRU= PTIBLE, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c: In function 'qxl_framebuffer_surface_d= irty': > drivers/gpu/drm/qxl/qxl_display.c:434:35: error: macro "DRM_MODESET_LOCK_= ALL_END" requires 3 arguments, but only 2 given > 434 | DRM_MODESET_LOCK_ALL_END(ctx, ret); > | ^ > In file included from include/drm/drm_crtc.h:36, > from include/drm/drm_atomic.h:31, > from drivers/gpu/drm/qxl/qxl_display.c:29: > include/drm/drm_modeset_lock.h:194: note: macro "DRM_MODESET_LOCK_ALL_END= " defined here > 194 | #define DRM_MODESET_LOCK_ALL_END(dev, ctx, ret) \ > |=20 > drivers/gpu/drm/qxl/qxl_display.c:434:2: error: 'DRM_MODESET_LOCK_ALL_END= ' undeclared (first use in this function) > 434 | DRM_MODESET_LOCK_ALL_END(ctx, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c:411:2: error: label 'modeset_lock_fail'= used but not defined > 411 | DRM_MODESET_LOCK_ALL_BEGIN(fb->dev, ctx, DRM_MODESET_ACQUIRE_INT= ERRUPTIBLE, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > In file included from include/drm/drm_crtc.h:36, > from include/drm/drm_atomic.h:31, > from drivers/gpu/drm/qxl/qxl_display.c:29: > include/drm/drm_modeset_lock.h:170:1: warning: label 'modeset_lock_retry'= defined but not used [-Wunused-label] > 170 | modeset_lock_retry: \ > | ^~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c:411:2: note: in expansion of macro 'DRM= _MODESET_LOCK_ALL_BEGIN' > 411 | DRM_MODESET_LOCK_ALL_BEGIN(fb->dev, ctx, DRM_MODESET_ACQUIRE_INT= ERRUPTIBLE, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ >=20 > Caused by commit >=20 > bbaac1354cc9 ("drm/qxl: Replace deprecated function in qxl_display") >=20 > interacting with commit >=20 > 77ef38574beb ("drm/modeset-lock: Take the modeset BKL for legacy driver= s") >=20 > from the drm-misc-fixes tree. >=20 > drivers/gpu/drm/qxl/qxl_display.c manages to include > drm/drm_modeset_lock.h by some indirect route, but fails to have > drm/drm_drv.h similarly included. In fact, drm/drm_modeset_lock.h should > have included drm/drm_drv.h since it uses things declared there, and > drivers/gpu/drm/qxl/qxl_display.c should include drm/drm_modeset_lock.h > similarly. >=20 > I have added the following hack patch for today. >=20 > From: Stephen Rothwell > Date: Wed, 26 Aug 2020 10:40:18 +1000 > Subject: [PATCH] fix interaction with drm-misc-fix commit >=20 > Signed-off-by: Stephen Rothwell > --- > drivers/gpu/drm/qxl/qxl_display.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) >=20 > diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_= display.c > index fa79688013b7..6063f3a15329 100644 > --- a/drivers/gpu/drm/qxl/qxl_display.c > +++ b/drivers/gpu/drm/qxl/qxl_display.c > @@ -26,6 +26,7 @@ > #include > #include > =20 > +#include > #include > #include > #include > @@ -186,7 +187,7 @@ void qxl_display_read_client_monitors_config(struct q= xl_device *qdev) > =20 > DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE,= ret); > qxl_update_offset_props(qdev); > - DRM_MODESET_LOCK_ALL_END(ctx, ret); > + DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); > if (!drm_helper_hpd_irq_event(dev)) { > /* notify that the monitor configuration changed, to > adjust at the arbitrary resolution */ > @@ -431,7 +432,7 @@ static int qxl_framebuffer_surface_dirty(struct drm_f= ramebuffer *fb, > clips, num_clips, inc, 0); > =20 > out_lock_end: > - DRM_MODESET_LOCK_ALL_END(ctx, ret); > + DRM_MODESET_LOCK_ALL_END(fb->dev, ctx, ret); > =20 > return 0; > } > --=20 > 2.28.0 This is now a build failure in the drm tree merg. I have added the above hack to the merge of the drm tree today. --=20 Cheers, Stephen Rothwell --Sig_/YizQk8yowqeEyhmG.EVW9OP Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl9PDDAACgkQAVBC80lX 0GwWdQgAoEm/nwWRUBzrY04JBxZ/dU6Tyuaalu0tAfgNKW5ve0o+yoPr/wVNxDM5 hX94A3NBEErFIfrm2DSXLWhGmbO4MTYqxJVxFE9ZffZgiabFuQNpQXTVNYApFsuU 4Wo+7W02qcSFNP4wUEOpa45kHiBgdfbMhkc6nA7kepgDx6n1BWuwEhuv9gBhrnfu hov8SK949yEdeWfkdLFkSv0LTsBVWjTHqMJT/qLBM/JCJooX2wIFcL2TMcKIO3qE 3lrUnoC0LIQsfLDXnhF8uaZvg3dwTRmc3YARO/iaCJGo0RIFIXVdH8JayAg9Dhk2 ei7kweWMeYAB9xeho1VqxUQC1vf3NQ== =qzdE -----END PGP SIGNATURE----- --Sig_/YizQk8yowqeEyhmG.EVW9OP-- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11FACC43461 for ; Wed, 2 Sep 2020 03:06:36 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DB92C206F0 for ; Wed, 2 Sep 2020 03:06:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="S4NyqMv/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DB92C206F0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 19F1A6E0B6; Wed, 2 Sep 2020 03:06:34 +0000 (UTC) Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8CD4789CBE; Wed, 2 Sep 2020 03:06:32 +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 (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Bh83R5Kh2z9sSJ; Wed, 2 Sep 2020 13:06:27 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1599015990; bh=zim69dfuPpB8Yc/TUTIMWuP0ktKGex5mslQ+gJxzaq0=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=S4NyqMv/TQ3NRUoeVx95Jqy8U4YUbFnZDytjI8fpZrDZYqqvSK6kp82n2SQpnRKjt PkBLDzrcz24MU2xUbXqehJgEXy89v5JM9+ETWwuL5ktGRyf078zXDRRwyJyBZ2A6dA 76QM/XUS8aKK+dRL6YKa9GT5P1HNVoA/wZhg+QIO6qeuLM9M8fZs8WUTSvBxIii2oL ajU/FFlGx3EXM3NYTuSDXDCJMq5NzzPPXUQnZ5/dQ+Mbj1pvzdnpZQacD6gtnf9Wwv V/fUpA5CZLX9KEybaCM44/aHaCl482MG7h4BTbpq49hh/6nSHHZRKECudeEFbUWaui 4+OKMjaKkalzg== Date: Wed, 2 Sep 2020 13:06:24 +1000 From: Stephen Rothwell To: Dave Airlie Subject: Re: linux-next: build failure after merge of the drm-misc tree Message-ID: <20200902130624.18983108@canb.auug.org.au> In-Reply-To: <20200826105547.4f6ea26d@canb.auug.org.au> References: <20200826105547.4f6ea26d@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Gerd Hoffmann , Alex Deucher , Sidong Yang Content-Type: multipart/mixed; boundary="===============1463785593==" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" --===============1463785593== Content-Type: multipart/signed; boundary="Sig_/YizQk8yowqeEyhmG.EVW9OP"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/YizQk8yowqeEyhmG.EVW9OP Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Wed, 26 Aug 2020 10:55:47 +1000 Stephen Rothwell = wrote: > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: >=20 > drivers/gpu/drm/qxl/qxl_display.c: In function 'qxl_display_read_client_m= onitors_config': > include/drm/drm_modeset_lock.h:167:7: error: implicit declaration of func= tion 'drm_drv_uses_atomic_modeset' [-Werror=3Dimplicit-function-declaration] > 167 | if (!drm_drv_uses_atomic_modeset(dev)) \ > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c:187:2: note: in expansion of macro 'DRM= _MODESET_LOCK_ALL_BEGIN' > 187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRU= PTIBLE, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c:189:35: error: macro "DRM_MODESET_LOCK_= ALL_END" requires 3 arguments, but only 2 given > 189 | DRM_MODESET_LOCK_ALL_END(ctx, ret); > | ^ > In file included from include/drm/drm_crtc.h:36, > from include/drm/drm_atomic.h:31, > from drivers/gpu/drm/qxl/qxl_display.c:29: > include/drm/drm_modeset_lock.h:194: note: macro "DRM_MODESET_LOCK_ALL_END= " defined here > 194 | #define DRM_MODESET_LOCK_ALL_END(dev, ctx, ret) \ > |=20 > drivers/gpu/drm/qxl/qxl_display.c:189:2: error: 'DRM_MODESET_LOCK_ALL_END= ' undeclared (first use in this function) > 189 | DRM_MODESET_LOCK_ALL_END(ctx, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c:189:2: note: each undeclared identifier= is reported only once for each function it appears in > drivers/gpu/drm/qxl/qxl_display.c:187:2: error: label 'modeset_lock_fail'= used but not defined > 187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRU= PTIBLE, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > In file included from include/drm/drm_crtc.h:36, > from include/drm/drm_atomic.h:31, > from drivers/gpu/drm/qxl/qxl_display.c:29: > include/drm/drm_modeset_lock.h:170:1: warning: label 'modeset_lock_retry'= defined but not used [-Wunused-label] > 170 | modeset_lock_retry: \ > | ^~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c:187:2: note: in expansion of macro 'DRM= _MODESET_LOCK_ALL_BEGIN' > 187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRU= PTIBLE, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c: In function 'qxl_framebuffer_surface_d= irty': > drivers/gpu/drm/qxl/qxl_display.c:434:35: error: macro "DRM_MODESET_LOCK_= ALL_END" requires 3 arguments, but only 2 given > 434 | DRM_MODESET_LOCK_ALL_END(ctx, ret); > | ^ > In file included from include/drm/drm_crtc.h:36, > from include/drm/drm_atomic.h:31, > from drivers/gpu/drm/qxl/qxl_display.c:29: > include/drm/drm_modeset_lock.h:194: note: macro "DRM_MODESET_LOCK_ALL_END= " defined here > 194 | #define DRM_MODESET_LOCK_ALL_END(dev, ctx, ret) \ > |=20 > drivers/gpu/drm/qxl/qxl_display.c:434:2: error: 'DRM_MODESET_LOCK_ALL_END= ' undeclared (first use in this function) > 434 | DRM_MODESET_LOCK_ALL_END(ctx, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c:411:2: error: label 'modeset_lock_fail'= used but not defined > 411 | DRM_MODESET_LOCK_ALL_BEGIN(fb->dev, ctx, DRM_MODESET_ACQUIRE_INT= ERRUPTIBLE, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > In file included from include/drm/drm_crtc.h:36, > from include/drm/drm_atomic.h:31, > from drivers/gpu/drm/qxl/qxl_display.c:29: > include/drm/drm_modeset_lock.h:170:1: warning: label 'modeset_lock_retry'= defined but not used [-Wunused-label] > 170 | modeset_lock_retry: \ > | ^~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c:411:2: note: in expansion of macro 'DRM= _MODESET_LOCK_ALL_BEGIN' > 411 | DRM_MODESET_LOCK_ALL_BEGIN(fb->dev, ctx, DRM_MODESET_ACQUIRE_INT= ERRUPTIBLE, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ >=20 > Caused by commit >=20 > bbaac1354cc9 ("drm/qxl: Replace deprecated function in qxl_display") >=20 > interacting with commit >=20 > 77ef38574beb ("drm/modeset-lock: Take the modeset BKL for legacy driver= s") >=20 > from the drm-misc-fixes tree. >=20 > drivers/gpu/drm/qxl/qxl_display.c manages to include > drm/drm_modeset_lock.h by some indirect route, but fails to have > drm/drm_drv.h similarly included. In fact, drm/drm_modeset_lock.h should > have included drm/drm_drv.h since it uses things declared there, and > drivers/gpu/drm/qxl/qxl_display.c should include drm/drm_modeset_lock.h > similarly. >=20 > I have added the following hack patch for today. >=20 > From: Stephen Rothwell > Date: Wed, 26 Aug 2020 10:40:18 +1000 > Subject: [PATCH] fix interaction with drm-misc-fix commit >=20 > Signed-off-by: Stephen Rothwell > --- > drivers/gpu/drm/qxl/qxl_display.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) >=20 > diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_= display.c > index fa79688013b7..6063f3a15329 100644 > --- a/drivers/gpu/drm/qxl/qxl_display.c > +++ b/drivers/gpu/drm/qxl/qxl_display.c > @@ -26,6 +26,7 @@ > #include > #include > =20 > +#include > #include > #include > #include > @@ -186,7 +187,7 @@ void qxl_display_read_client_monitors_config(struct q= xl_device *qdev) > =20 > DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE,= ret); > qxl_update_offset_props(qdev); > - DRM_MODESET_LOCK_ALL_END(ctx, ret); > + DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); > if (!drm_helper_hpd_irq_event(dev)) { > /* notify that the monitor configuration changed, to > adjust at the arbitrary resolution */ > @@ -431,7 +432,7 @@ static int qxl_framebuffer_surface_dirty(struct drm_f= ramebuffer *fb, > clips, num_clips, inc, 0); > =20 > out_lock_end: > - DRM_MODESET_LOCK_ALL_END(ctx, ret); > + DRM_MODESET_LOCK_ALL_END(fb->dev, ctx, ret); > =20 > return 0; > } > --=20 > 2.28.0 This is now a build failure in the drm tree merg. I have added the above hack to the merge of the drm tree today. --=20 Cheers, Stephen Rothwell --Sig_/YizQk8yowqeEyhmG.EVW9OP Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl9PDDAACgkQAVBC80lX 0GwWdQgAoEm/nwWRUBzrY04JBxZ/dU6Tyuaalu0tAfgNKW5ve0o+yoPr/wVNxDM5 hX94A3NBEErFIfrm2DSXLWhGmbO4MTYqxJVxFE9ZffZgiabFuQNpQXTVNYApFsuU 4Wo+7W02qcSFNP4wUEOpa45kHiBgdfbMhkc6nA7kepgDx6n1BWuwEhuv9gBhrnfu hov8SK949yEdeWfkdLFkSv0LTsBVWjTHqMJT/qLBM/JCJooX2wIFcL2TMcKIO3qE 3lrUnoC0LIQsfLDXnhF8uaZvg3dwTRmc3YARO/iaCJGo0RIFIXVdH8JayAg9Dhk2 ei7kweWMeYAB9xeho1VqxUQC1vf3NQ== =qzdE -----END PGP SIGNATURE----- --Sig_/YizQk8yowqeEyhmG.EVW9OP-- --===============1463785593== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel --===============1463785593==-- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98B47C433E6 for ; Wed, 2 Sep 2020 03:06:34 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 392242068F for ; Wed, 2 Sep 2020 03:06:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="S4NyqMv/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 392242068F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D1D9889CBE; Wed, 2 Sep 2020 03:06:33 +0000 (UTC) Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8CD4789CBE; Wed, 2 Sep 2020 03:06:32 +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 (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Bh83R5Kh2z9sSJ; Wed, 2 Sep 2020 13:06:27 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1599015990; bh=zim69dfuPpB8Yc/TUTIMWuP0ktKGex5mslQ+gJxzaq0=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=S4NyqMv/TQ3NRUoeVx95Jqy8U4YUbFnZDytjI8fpZrDZYqqvSK6kp82n2SQpnRKjt PkBLDzrcz24MU2xUbXqehJgEXy89v5JM9+ETWwuL5ktGRyf078zXDRRwyJyBZ2A6dA 76QM/XUS8aKK+dRL6YKa9GT5P1HNVoA/wZhg+QIO6qeuLM9M8fZs8WUTSvBxIii2oL ajU/FFlGx3EXM3NYTuSDXDCJMq5NzzPPXUQnZ5/dQ+Mbj1pvzdnpZQacD6gtnf9Wwv V/fUpA5CZLX9KEybaCM44/aHaCl482MG7h4BTbpq49hh/6nSHHZRKECudeEFbUWaui 4+OKMjaKkalzg== Date: Wed, 2 Sep 2020 13:06:24 +1000 From: Stephen Rothwell To: Dave Airlie Message-ID: <20200902130624.18983108@canb.auug.org.au> In-Reply-To: <20200826105547.4f6ea26d@canb.auug.org.au> References: <20200826105547.4f6ea26d@canb.auug.org.au> MIME-Version: 1.0 Subject: Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Gerd Hoffmann , Alex Deucher , Sidong Yang Content-Type: multipart/mixed; boundary="===============1818174677==" Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" --===============1818174677== Content-Type: multipart/signed; boundary="Sig_/YizQk8yowqeEyhmG.EVW9OP"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/YizQk8yowqeEyhmG.EVW9OP Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Wed, 26 Aug 2020 10:55:47 +1000 Stephen Rothwell = wrote: > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: >=20 > drivers/gpu/drm/qxl/qxl_display.c: In function 'qxl_display_read_client_m= onitors_config': > include/drm/drm_modeset_lock.h:167:7: error: implicit declaration of func= tion 'drm_drv_uses_atomic_modeset' [-Werror=3Dimplicit-function-declaration] > 167 | if (!drm_drv_uses_atomic_modeset(dev)) \ > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c:187:2: note: in expansion of macro 'DRM= _MODESET_LOCK_ALL_BEGIN' > 187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRU= PTIBLE, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c:189:35: error: macro "DRM_MODESET_LOCK_= ALL_END" requires 3 arguments, but only 2 given > 189 | DRM_MODESET_LOCK_ALL_END(ctx, ret); > | ^ > In file included from include/drm/drm_crtc.h:36, > from include/drm/drm_atomic.h:31, > from drivers/gpu/drm/qxl/qxl_display.c:29: > include/drm/drm_modeset_lock.h:194: note: macro "DRM_MODESET_LOCK_ALL_END= " defined here > 194 | #define DRM_MODESET_LOCK_ALL_END(dev, ctx, ret) \ > |=20 > drivers/gpu/drm/qxl/qxl_display.c:189:2: error: 'DRM_MODESET_LOCK_ALL_END= ' undeclared (first use in this function) > 189 | DRM_MODESET_LOCK_ALL_END(ctx, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c:189:2: note: each undeclared identifier= is reported only once for each function it appears in > drivers/gpu/drm/qxl/qxl_display.c:187:2: error: label 'modeset_lock_fail'= used but not defined > 187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRU= PTIBLE, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > In file included from include/drm/drm_crtc.h:36, > from include/drm/drm_atomic.h:31, > from drivers/gpu/drm/qxl/qxl_display.c:29: > include/drm/drm_modeset_lock.h:170:1: warning: label 'modeset_lock_retry'= defined but not used [-Wunused-label] > 170 | modeset_lock_retry: \ > | ^~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c:187:2: note: in expansion of macro 'DRM= _MODESET_LOCK_ALL_BEGIN' > 187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRU= PTIBLE, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c: In function 'qxl_framebuffer_surface_d= irty': > drivers/gpu/drm/qxl/qxl_display.c:434:35: error: macro "DRM_MODESET_LOCK_= ALL_END" requires 3 arguments, but only 2 given > 434 | DRM_MODESET_LOCK_ALL_END(ctx, ret); > | ^ > In file included from include/drm/drm_crtc.h:36, > from include/drm/drm_atomic.h:31, > from drivers/gpu/drm/qxl/qxl_display.c:29: > include/drm/drm_modeset_lock.h:194: note: macro "DRM_MODESET_LOCK_ALL_END= " defined here > 194 | #define DRM_MODESET_LOCK_ALL_END(dev, ctx, ret) \ > |=20 > drivers/gpu/drm/qxl/qxl_display.c:434:2: error: 'DRM_MODESET_LOCK_ALL_END= ' undeclared (first use in this function) > 434 | DRM_MODESET_LOCK_ALL_END(ctx, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c:411:2: error: label 'modeset_lock_fail'= used but not defined > 411 | DRM_MODESET_LOCK_ALL_BEGIN(fb->dev, ctx, DRM_MODESET_ACQUIRE_INT= ERRUPTIBLE, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > In file included from include/drm/drm_crtc.h:36, > from include/drm/drm_atomic.h:31, > from drivers/gpu/drm/qxl/qxl_display.c:29: > include/drm/drm_modeset_lock.h:170:1: warning: label 'modeset_lock_retry'= defined but not used [-Wunused-label] > 170 | modeset_lock_retry: \ > | ^~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/qxl/qxl_display.c:411:2: note: in expansion of macro 'DRM= _MODESET_LOCK_ALL_BEGIN' > 411 | DRM_MODESET_LOCK_ALL_BEGIN(fb->dev, ctx, DRM_MODESET_ACQUIRE_INT= ERRUPTIBLE, ret); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ >=20 > Caused by commit >=20 > bbaac1354cc9 ("drm/qxl: Replace deprecated function in qxl_display") >=20 > interacting with commit >=20 > 77ef38574beb ("drm/modeset-lock: Take the modeset BKL for legacy driver= s") >=20 > from the drm-misc-fixes tree. >=20 > drivers/gpu/drm/qxl/qxl_display.c manages to include > drm/drm_modeset_lock.h by some indirect route, but fails to have > drm/drm_drv.h similarly included. In fact, drm/drm_modeset_lock.h should > have included drm/drm_drv.h since it uses things declared there, and > drivers/gpu/drm/qxl/qxl_display.c should include drm/drm_modeset_lock.h > similarly. >=20 > I have added the following hack patch for today. >=20 > From: Stephen Rothwell > Date: Wed, 26 Aug 2020 10:40:18 +1000 > Subject: [PATCH] fix interaction with drm-misc-fix commit >=20 > Signed-off-by: Stephen Rothwell > --- > drivers/gpu/drm/qxl/qxl_display.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) >=20 > diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_= display.c > index fa79688013b7..6063f3a15329 100644 > --- a/drivers/gpu/drm/qxl/qxl_display.c > +++ b/drivers/gpu/drm/qxl/qxl_display.c > @@ -26,6 +26,7 @@ > #include > #include > =20 > +#include > #include > #include > #include > @@ -186,7 +187,7 @@ void qxl_display_read_client_monitors_config(struct q= xl_device *qdev) > =20 > DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE,= ret); > qxl_update_offset_props(qdev); > - DRM_MODESET_LOCK_ALL_END(ctx, ret); > + DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); > if (!drm_helper_hpd_irq_event(dev)) { > /* notify that the monitor configuration changed, to > adjust at the arbitrary resolution */ > @@ -431,7 +432,7 @@ static int qxl_framebuffer_surface_dirty(struct drm_f= ramebuffer *fb, > clips, num_clips, inc, 0); > =20 > out_lock_end: > - DRM_MODESET_LOCK_ALL_END(ctx, ret); > + DRM_MODESET_LOCK_ALL_END(fb->dev, ctx, ret); > =20 > return 0; > } > --=20 > 2.28.0 This is now a build failure in the drm tree merg. I have added the above hack to the merge of the drm tree today. --=20 Cheers, Stephen Rothwell --Sig_/YizQk8yowqeEyhmG.EVW9OP Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl9PDDAACgkQAVBC80lX 0GwWdQgAoEm/nwWRUBzrY04JBxZ/dU6Tyuaalu0tAfgNKW5ve0o+yoPr/wVNxDM5 hX94A3NBEErFIfrm2DSXLWhGmbO4MTYqxJVxFE9ZffZgiabFuQNpQXTVNYApFsuU 4Wo+7W02qcSFNP4wUEOpa45kHiBgdfbMhkc6nA7kepgDx6n1BWuwEhuv9gBhrnfu hov8SK949yEdeWfkdLFkSv0LTsBVWjTHqMJT/qLBM/JCJooX2wIFcL2TMcKIO3qE 3lrUnoC0LIQsfLDXnhF8uaZvg3dwTRmc3YARO/iaCJGo0RIFIXVdH8JayAg9Dhk2 ei7kweWMeYAB9xeho1VqxUQC1vf3NQ== =qzdE -----END PGP SIGNATURE----- --Sig_/YizQk8yowqeEyhmG.EVW9OP-- --===============1818174677== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============1818174677==--