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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 5891EC4320E for ; Wed, 1 Sep 2021 22:01:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3825161053 for ; Wed, 1 Sep 2021 22:01:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233034AbhIAWCa (ORCPT ); Wed, 1 Sep 2021 18:02:30 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:38423 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232860AbhIAWC2 (ORCPT ); Wed, 1 Sep 2021 18:02:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1630533689; bh=BmOhYKXE2qZFZfsXd4GE6m5wy+5xaYYXRavSABb85Xs=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=kUwMjkpmDxp1jp8EEC09mKkUmAD9D3u9tYzRrriQKkS+NEZp6cCQptNKJrwXuxmd3 eteZmx9YIlArV8ZB5EfrqELziHixzMr2r4SBWY5g5FgxUzpJiWEtD2Rq4fYaBfC3ar 5HjndCDuTSUAUoj2q6QpPTBddHSUsXXYvsGH3/hZzJtpkNekSnZj6p6PiWMNunC7l0 MkfjC0abHs5wXF2P5Y0Sp398obMONd5bfXzfV9Q+81a3eTdr/3E8oxR+kaMmXmqpvX XxNJiQw2umgHwKQW9wWw/VKaJi9rDH4pUwwhytcAcER6kJYiqaSnGUFEpMjqcolvAF bBLww/9GNtZQA== 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 4H0J126w99z9sPf; Thu, 2 Sep 2021 08:01:26 +1000 (AEST) Date: Thu, 2 Sep 2021 08:01:25 +1000 From: Stephen Rothwell To: Jason Gunthorpe Cc: Dave Airlie , DRI , Jason Gunthorpe , Jason Gunthorpe , Leon Romanovsky , Maor Gottlieb , Maarten Lankhorst , Thomas =?UTF-8?B?SGVsbHN0?= =?UTF-8?B?csO2bQ==?= , Linux Kernel Mailing List , Linux Next Mailing List , Doug Ledford Subject: Re: linux-next: build failure after merge of the hmm tree Message-ID: <20210902080125.2872628b@canb.auug.org.au> In-Reply-To: <20210823175027.3f3fabd7@canb.auug.org.au> References: <20210823175027.3f3fabd7@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/stlCEP4gLQ3cyH/reb0cPfS"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/stlCEP4gLQ3cyH/reb0cPfS Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi , On Mon, 23 Aug 2021 17:50:27 +1000 Stephen Rothwell = wrote: > > Hi all, >=20 > After merging the hmm tree, today's linux-next build (x86_64 allmodconfig) > failed like this: >=20 > drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_tt_get_st': > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:396:7: error: implicit declaratio= n of function '__sg_alloc_table_from_pages'; did you mean 'sg_alloc_table_f= rom_pages'? [-Werror=3Dimplicit-function-declaration] > 396 | sg =3D __sg_alloc_table_from_pages > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > | sg_alloc_table_from_pages > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:396:5: warning: assignment to 'st= ruct scatterlist *' from 'int' makes pointer from integer without a cast [-= Wint-conversion] > 396 | sg =3D __sg_alloc_table_from_pages > | ^ >=20 > Caused by commit >=20 > fcbfe956561b ("lib/scatterlist: Provide a dedicated function to support= table append") >=20 > interacting with commit >=20 > 213d50927763 ("drm/i915/ttm: Introduce a TTM i915 gem object backend") >=20 > from the drm tree. >=20 > I have applied the following merge resolution patch. >=20 > From: Stephen Rothwell > Date: Mon, 23 Aug 2021 17:46:27 +1000 > Subject: [PATCH] drm/i915/ttm: fix up for "lib/scatterlist: Provide a > dedicated function to support tableappend" >=20 > Signed-off-by: Stephen Rothwell > --- > drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) >=20 > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i9= 15/gem/i915_gem_ttm.c > index 771eb2963123..d3d95934a047 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c > @@ -382,7 +382,6 @@ i915_ttm_region(struct ttm_device *bdev, int ttm_mem_= type) > static struct sg_table *i915_ttm_tt_get_st(struct ttm_tt *ttm) > { > struct i915_ttm_tt *i915_tt =3D container_of(ttm, typeof(*i915_tt), ttm= ); > - struct scatterlist *sg; > struct sg_table *st; > int ret; > =20 > @@ -393,13 +392,13 @@ static struct sg_table *i915_ttm_tt_get_st(struct t= tm_tt *ttm) > if (!st) > return ERR_PTR(-ENOMEM); > =20 > - sg =3D __sg_alloc_table_from_pages > + ret =3D sg_alloc_table_from_pages_segment > (st, ttm->pages, ttm->num_pages, 0, > (unsigned long)ttm->num_pages << PAGE_SHIFT, > - i915_sg_segment_size(), NULL, 0, GFP_KERNEL); > - if (IS_ERR(sg)) { > + i915_sg_segment_size(), GFP_KERNEL); > + if (ret) { > kfree(st); > - return ERR_CAST(sg); > + return ERR_PTR(ret); > } > =20 > ret =3D dma_map_sgtable(i915_tt->dev, st, DMA_BIDIRECTIONAL, 0); I am now applying this merge fix patch to the merge of the rdma tree (since that has merged the hmm tree and the drm tree has been merged upstream). --=20 Cheers, Stephen Rothwell --Sig_/stlCEP4gLQ3cyH/reb0cPfS Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmEv+DUACgkQAVBC80lX 0Gx9WAf9EPASlxghM4C7XRvD7i/Ap/naEcc9lkxTPGlLfZuyg+sevCTU2HTadYNq 7e4QNotQV8nHaXvCzSwwJ83uYHtVf85mKVgXb+w5cV48E0lk0ASVX5w6KGLOAdpo WkJUu2CCkxCTPXFrPeK4gBvSLw4Xekv0QskQB/nAon2jfJmQkYXtBPWf2VULegsN Rp6xj4txXVGj4MEBhGZpFQF2q3D1a+6h/JcbpMUJKTo7n7QEjgzlP6gsLlWng5Qh FUIYW8GAAZrqcDBaaHsmJHUr/Y5Ow3Jjw4f1imTy72hRHpaF2cn12G+uyK0N39A6 EEc2mV+4nQ1YqrfUC2a1qb1yZlOhjw== =iXH5 -----END PGP SIGNATURE----- --Sig_/stlCEP4gLQ3cyH/reb0cPfS--