From patchwork Mon Apr 1 23:50:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 10880827 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 15C6C17EE for ; Mon, 1 Apr 2019 23:50:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0083928793 for ; Mon, 1 Apr 2019 23:50:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E8C9A28797; Mon, 1 Apr 2019 23:50:17 +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 8FCED28795 for ; Mon, 1 Apr 2019 23:50:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 04AED6E2A7; Mon, 1 Apr 2019 23:50:14 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org X-Greylist: delayed 89437 seconds by postgrey-1.36 at gabe; Mon, 01 Apr 2019 23:50:12 UTC Received: from ozlabs.org (ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 632216E2A6; Mon, 1 Apr 2019 23:50:12 +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 44Y8GR0SKRz9sRk; Tue, 2 Apr 2019 10:50:06 +1100 (AEDT) Date: Tue, 2 Apr 2019 10:50:06 +1100 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Message-ID: <20190402105006.48f93e53@canb.auug.org.au> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1554162609; bh=3KuGHfxYoRQI4+fxh4dETcyKaRGfVPKxqivvckEsH7g=; h=Date:From:To:Cc:Subject:From; b=k3VSDY+ijIYCs6u1CIFASkhthjWNVnIUpojhTK9cCBw4RaqGcUxkmAgiPZckwMU5H /YjNSyf/BhRlLhfPL8h3NKR4Q9wmgXsm7hi3PT4hvLP5j+Pic1447MHGtvZHihHZG9 CLiZLRM+8dTi+N38Di4Lm6TieIO5Q5/8iyQpSebtV+1742dgjKQuJWpFIQd6/7o0W3 LyDh51nBKKq7o4lktqpmnDqkALGN73eO0RP5qVOr7d30rmafi/lUkFSOJ9YJQ0xOyM RQH1bBxGzo9bYuZM0wfeH/dLWJuINjPBZmcc0EJ4kNAJxShBiR+nTnvWGg/GY4k2Mi nndf8hi3LX4Pg== Subject: [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.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux Next Mailing List , Linux Kernel Mailing List , Matthew Wilcox , Qiang Yu Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from include/linux/kernel.h:7, from include/asm-generic/bug.h:18, from arch/x86/include/asm/bug.h:83, from include/linux/bug.h:5, from include/linux/mmdebug.h:5, from include/linux/gfp.h:5, from include/linux/slab.h:15, from drivers/gpu/drm/lima/lima_ctx.c:4: drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_create': include/linux/limits.h:13:18: warning: passing argument 3 of 'xa_alloc' makes pointer from integer without a cast [-Wint-conversion] #define UINT_MAX (~0U) ^~~~~ drivers/gpu/drm/lima/lima_ctx.c:26:36: note: in expansion of macro 'UINT_MAX' err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL); ^~~~~~~~ In file included from include/linux/radix-tree.h:31, from include/linux/idr.h:15, from include/drm/drm_device.h:7, from drivers/gpu/drm/lima/lima_device.h:7, from drivers/gpu/drm/lima/lima_ctx.c:6: include/linux/xarray.h:817:9: note: expected 'void *' but argument is of type 'unsigned int' void *entry, struct xa_limit limit, gfp_t gfp) ~~~~~~^~~~~ drivers/gpu/drm/lima/lima_ctx.c:26:46: error: incompatible type for argument 4 of 'xa_alloc' err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL); ^~~ In file included from include/linux/radix-tree.h:31, from include/linux/idr.h:15, from include/drm/drm_device.h:7, from drivers/gpu/drm/lima/lima_device.h:7, from drivers/gpu/drm/lima/lima_ctx.c:6: include/linux/xarray.h:817:32: note: expected 'struct xa_limit' but argument is of type 'struct lima_ctx *' void *entry, struct xa_limit limit, gfp_t gfp) ~~~~~~~~~~~~~~~~^~~~~ Caused by commit a1d2a6339961 ("drm/lima: driver for ARM Mali4xx GPUs") interacting with commit a3e4d3f97ec8 ("XArray: Redesign xa_alloc API") from Linus' tree (v5.1-rc1). I have applied the following patch for today. It could be applied as part of a merge of v5.1-rc1 into drm-misc. From: Stephen Rothwell Date: Tue, 2 Apr 2019 10:45:32 +1100 Subject: [PATCH] drm/lima: update for xa_alloc API change Signed-off-by: Stephen Rothwell Reviewed-by: Qiang Yu --- drivers/gpu/drm/lima/lima_ctx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/lima/lima_ctx.c b/drivers/gpu/drm/lima/lima_ctx.c index c8d12f7c6894..bafa00d74cc5 100644 --- a/drivers/gpu/drm/lima/lima_ctx.c +++ b/drivers/gpu/drm/lima/lima_ctx.c @@ -23,7 +23,7 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id) goto err_out0; } - err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL); + err = xa_alloc(&mgr->handles, id, ctx, XA_LIMIT(*id, UINT_MAX), GFP_KERNEL); if (err < 0) goto err_out0;