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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 52C53C282D1 for ; Fri, 7 Mar 2025 01:58:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1FBB110EAB0; Fri, 7 Mar 2025 01:58:12 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="Q7aYXUfu"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 77B1C10EAB0 for ; Fri, 7 Mar 2025 01:58:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1741312685; bh=SazVvVwwBsNBefYDvAJdJWJFydzPy+tuZJ1OcyNUcnY=; h=Date:From:To:Cc:Subject:From; b=Q7aYXUfucfQDIWlYZ3mMkM0VJL1ThPFJmZrk8WBtkwfJ1XGVn3nimsvT34nzjJK3E +kRdhP6yaaM7L+dKJiLM/aMlTyQaKEjBQOScMdNa4zBX3qgxgRClw6N0I0MlPzjluC 7SrjCOtmY4zQs1IscShoqozPP2Ll76AnQq2qrdbcQ0TsOJFQKcvlDvpV3xnDbQoOXF DpdzdC6iiz6yi3CFbfzaDNMe5QowJrJYZY2Yj33VhsXZyGC95GbrDtw2/elSwp9OVA 4/7zM/CmIN8MzqOq0uAfdWkZnnDhUT0I9kK1mxCuIPaphoYAatOhl0EqCk+hPPIhh9 Q20PALnMuplbg== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Z88ZN4HHVz4x1V; Fri, 7 Mar 2025 12:58:04 +1100 (AEDT) Date: Fri, 7 Mar 2025 12:58:03 +1100 From: Stephen Rothwell To: Lucas De Marchi , Thomas =?UTF-8?B?SGVsbHN0?= =?UTF-8?B?csO2bQ==?= , Andrew Morton Cc: Matthew Brost , Alistair Popple , Balbir Singh , DRM XE List , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the drm-xe tree Message-ID: <20250307125803.198cdedb@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/y6JHkmZmK6Nr=+/ADZEg89I"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" --Sig_/y6JHkmZmK6Nr=+/ADZEg89I Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, After merging the drm-xe tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/drm_gpusvm.c: In function 'drm_gpusvm_range_get_pages': drivers/gpu/drm/drm_gpusvm.c:1404:44: error: 'struct page' has no member na= med 'pgmap' 1404 | if (pagemap !=3D page->pgmap) { | ^~ drivers/gpu/drm/drm_gpusvm.c:1410:47: error: 'struct page' has no member na= med 'pgmap' 1410 | pagemap =3D page->pgmap; | ^~ Caused by commit 99624bdff867 ("drm/gpusvm: Add support for GPU Shared Virtual Memory") interacting with commit 089b22f60a0f ("mm: allow compound zone device pages") from the mm-unstable branch of the mm tree. I have applied the following merge fix patch for today. From: Stephen Rothwell Date: Fri, 7 Mar 2025 12:48:32 +1100 Subject: [PATCH] fix up for "drm/gpusvm: Add support for GPU Shared Virtual Memory" interacting with commit 089b22f60a0f ("mm: allow compound zone device pages") from the mm-unstable branch of the mm tree. Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/drm_gpusvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_gpusvm.c b/drivers/gpu/drm/drm_gpusvm.c index f314f5c4af0f..5e9b18ce65f8 100644 --- a/drivers/gpu/drm/drm_gpusvm.c +++ b/drivers/gpu/drm/drm_gpusvm.c @@ -1401,13 +1401,13 @@ int drm_gpusvm_range_get_pages(struct drm_gpusvm *g= pusvm, goto err_unmap; } zdd =3D page->zone_device_data; - if (pagemap !=3D page->pgmap) { + if (pagemap !=3D page_pgmap(page)) { if (i > 0) { err =3D -EOPNOTSUPP; goto err_unmap; } =20 - pagemap =3D page->pgmap; + pagemap =3D page_pgmap(page); dpagemap =3D zdd->devmem_allocation->dpagemap; if (drm_WARN_ON(gpusvm->drm, !dpagemap)) { /* --=20 2.45.2 --=20 Cheers, Stephen Rothwell --Sig_/y6JHkmZmK6Nr=+/ADZEg89I Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmfKUqsACgkQAVBC80lX 0GzKcQf/SV7/5IDch9gNv+og9r3T2B8GA5nfZAXIxqGZEvkTZ8PVyGEg6yXiAeqH 5q+DKpy81MldC1mZInO5OJuWP8Rf6Luvl4TgfXSxICrmpJEFCk0UuTxbsUmqHNyy RaszH3CBF3TXiy76nT3GwZSM+VXuJ8yanOf9PWqwAhx0HaagukOzhER4aJhnwG/j w2yLiwpqokvcP3DEBwJUXmBnFjyGQTCGfomIfQniMFhOADYE/MZS0n9Zu21KIqeA 77VIu1UCx4lLsoq7TU6RpIyFfjFLmocADWwU7To9oM3O6quRnIIytrmPOKDUfiHm ZGs7DGFpI4BeWXHQjdbI1qNBBWpWOw== =BazT -----END PGP SIGNATURE----- --Sig_/y6JHkmZmK6Nr=+/ADZEg89I--