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=-8.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_MUTT 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 BE910C4360F for ; Tue, 2 Apr 2019 09:08:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F79F207E0 for ; Tue, 2 Apr 2019 09:08:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="GvSbSDnY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729833AbfDBJIN (ORCPT ); Tue, 2 Apr 2019 05:08:13 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:45639 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726790AbfDBJIM (ORCPT ); Tue, 2 Apr 2019 05:08:12 -0400 Received: by mail-ed1-f65.google.com with SMTP id m16so10898417edd.12 for ; Tue, 02 Apr 2019 02:08:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=sender:date:from:to:cc:subject:message-id:mail-followup-to :references:mime-version:content-disposition:in-reply-to:user-agent; bh=oFHg+lBSloBl+YYC+znOHViFwx8OkjOVExLdtTv/B4Y=; b=GvSbSDnYgg75G0JtiVzcZ814iXjbx6lgqrqqTbAw4hfA67acHcJvJ9cIer5TAsqjSa 2WYlUnvWtupsZGJu4zstTfVh8/8+e8fhjtwU3iLwUEyMZPtQtWS55BgmzuBjB7p/rtV3 heRwAKzBWsu/Ll8HwS+R1Vi6LE//VVJ8O2YPg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to:user-agent; bh=oFHg+lBSloBl+YYC+znOHViFwx8OkjOVExLdtTv/B4Y=; b=pUCTyByNgOJJ8kOYgn0NzSrjnUlY2JztZ/50qWqKqssZjHYuAmo2W8ypyZ3jx+pX6J +2OvDv6jVBmloMTfrf+acDzhRreBgij2nqOEspOSHJ/nykv/u2uUVGdusFFeVD03VpY2 H0B+46/dFYSCTTgmyLG5x6Zb4/Vr4ExkjdF31ZuMk//tTHL9Dz7yNBvJUpEQjCUEZuxm EvENwsL7n42gph/0WrxlnzpnGefcxjYrM5n8nbAhL3lfESRtxAnejmU3G3X3DG97Mzou 0iRL9P6sWc4V0ZFbfBdduRuaA87ETfXGKyywwDdKHPBPLwFx3FnS9IS4Rka6JdGuRJkX fpUA== X-Gm-Message-State: APjAAAW7Xb5TqTnR4/epfBkXpHE0CyMpdH9aVpGmYQHe7cWbqZgSlvUH vjCTcUkVUMWRHHXUGFrnSRZYJw== X-Google-Smtp-Source: APXvYqym1Y6j3Ck8d0OwCVnjq0Vi3Kq4giFvM6w9hiZ6Ucc1tQmDvHrldFf03sbgyDsyonBmXWGeVw== X-Received: by 2002:a50:a5e5:: with SMTP id b34mr34827444edc.260.1554196090542; Tue, 02 Apr 2019 02:08:10 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id m47sm3932483edm.7.2019.04.02.02.08.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Apr 2019 02:08:09 -0700 (PDT) Date: Tue, 2 Apr 2019 11:08:07 +0200 From: Daniel Vetter To: Qiang Yu Cc: Stephen Rothwell , Intel Graphics , DRI , Linux Next Mailing List , Linux Kernel Mailing List , Eric Anholt , Matthew Wilcox , Daniel Vetter Subject: Re: linux-next: build failure after merge of the drm-misc tree Message-ID: <20190402090807.GI2665@phenom.ffwll.local> Mail-Followup-To: Qiang Yu , Stephen Rothwell , Intel Graphics , DRI , Linux Next Mailing List , Linux Kernel Mailing List , Eric Anholt , Matthew Wilcox References: <20190402105006.48f93e53@canb.auug.org.au> <20190402075744.GC2665@phenom.ffwll.local> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Operating-System: Linux phenom 4.19.0-1-amd64 User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Apr 02, 2019 at 04:59:37PM +0800, Qiang Yu wrote: > On Tue, Apr 2, 2019 at 3:57 PM Daniel Vetter wrote: > > > > On Tue, Apr 02, 2019 at 01:55:03PM +0800, Qiang Yu wrote: > > > Thanks, patch is: > > > Reviewed-by: Qiang Yu > > > > Good time to get started with committing patches? In general it's kinda > > confusing if the maintainer r-bs a patch, but doesn't say whether/when/how > > it gets merged. Big chance the patch will get lost in limbo and fall > > through cracks. > > Thanks for the remind, this patch should only be applied to drm-misc-next > branch when 5.1-rcx branch gets merged to drm-misc-next for the new > xa_alloc API. So I expect the guy who do the 5.1-rcx merge should apply > this patch. Who will do the merge? Oh right, I was kinda not yet awake :-) Yeah Dave/me and drm-misc maintainers will resolve this when drm-misc lands in drm-next. Might then need a backmerge in drm-misc to roll forward. -Daniel > > Regards, > Qiang > > > > > > > > > Regards, > > > Qiang > > > > > > On Tue, Apr 2, 2019 at 7:50 AM Stephen Rothwell wrote: > > > > > > > > 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 > > > > --- > > > > 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; > > > > > > > > -- > > > > 2.20.1 > > > > > > > > -- > > > > Cheers, > > > > Stephen Rothwell > > > > -- > > Daniel Vetter > > Software Engineer, Intel Corporation > > http://blog.ffwll.ch -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch