From patchwork Thu Jan 19 02:12:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13107292 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 11A35C38159 for ; Thu, 19 Jan 2023 02:12:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 62AA810E222; Thu, 19 Jan 2023 02:12:29 +0000 (UTC) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 428A310E222; Thu, 19 Jan 2023 02:12:27 +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 4Ny5jz1T6qz4xN1; Thu, 19 Jan 2023 13:12:23 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1674094343; bh=Zwx5h8g4pu1ve4peLagMpUQQBjAjjyv/cZ9FL+9fN0g=; h=Date:From:To:Cc:Subject:From; b=Qa2Un7n989BB/MPCzfMvxr2SE02pGdX92SHEIk0H1asQjBoFUDuLy9eTLFS0fzA4o 79KTu13mZxM5bPH9PN1wXWl9QIOw+j5HOt1Y5g/8QnqV6w0VJF+Hs1rRlkgq03hXuy gc7C6Hbfj/XsfDKYf40avvH6521R7Ps0M+jd5xS17G27SdtonvAvssSifB8Y8E2oAK +FSS8w8tZCGiNmJ1K+siU10J5U3eN1jUBvN/vC+gRC55FwscOXNZDET3Zq5M7R7izs B+DZcrs+tK8edaSRWgkeWt9scM/0uxGFi4GiSjN7Drtx/3AZIvuNVpxF9cqvqBNlml UPrMbYKKqiSSA== Date: Thu, 19 Jan 2023 13:12:22 +1100 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter Subject: linux-next: build failure after merge of the drm tree Message-ID: <20230119131222.4b7697c1@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: Intel Graphics , Linux Next Mailing List , DRI , Thomas Zimmermann , Linux Kernel Mailing List Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, After merging the drm tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from drivers/gpu/drm/drm_fb_helper.c:33: drivers/gpu/drm/drm_fb_helper.c: In function 'drm_fb_helper_single_fb_probe': drivers/gpu/drm/drm_fb_helper.c:1968:24: error: 'dev' undeclared (first use in this function); did you mean 'cdev'? 1968 | if (dev_is_pci(dev->dev)) | ^~~ include/linux/pci.h:1151:25: note: in definition of macro 'dev_is_pci' 1151 | #define dev_is_pci(d) ((d)->bus == &pci_bus_type) | ^ drivers/gpu/drm/drm_fb_helper.c:1968:24: note: each undeclared identifier is reported only once for each function it appears in 1968 | if (dev_is_pci(dev->dev)) | ^~~ include/linux/pci.h:1151:25: note: in definition of macro 'dev_is_pci' 1151 | #define dev_is_pci(d) ((d)->bus == &pci_bus_type) | ^ In file included from include/linux/atomic/atomic-instrumented.h:20, from include/linux/atomic.h:82, from include/linux/console.h:17, from drivers/gpu/drm/drm_fb_helper.c:32: include/linux/compiler_types.h:299:27: error: expression in static assertion is not an integer 299 | #define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b)) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:78:56: note: in definition of macro '__static_assert' 78 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg) | ^~~~ include/linux/container_of.h:20:9: note: in expansion of macro 'static_assert' 20 | static_assert(__same_type(*(ptr), ((type *)0)->member) || \ | ^~~~~~~~~~~~~ include/linux/container_of.h:20:23: note: in expansion of macro '__same_type' 20 | static_assert(__same_type(*(ptr), ((type *)0)->member) || \ | ^~~~~~~~~~~ include/linux/pci.h:541:23: note: in expansion of macro 'container_of' 541 | #define to_pci_dev(n) container_of(n, struct pci_dev, dev) | ^~~~~~~~~~~~ drivers/gpu/drm/drm_fb_helper.c:1969:46: note: in expansion of macro 'to_pci_dev' 1969 | vga_switcheroo_client_fb_set(to_pci_dev(dev->dev), fb_helper->info); | ^~~~~~~~~~ Caused by commit cff84bac9922 ("drm/fh-helper: Split fbdev single-probe helper") interacting with commit d1d5101452ab ("drm/fb-helper: Set framebuffer for vga-switcheroo clients") from the drm-misc-fixes tree. I have added the following merge fix patch. From: Stephen Rothwell Date: Thu, 19 Jan 2023 12:42:56 +1100 Subject: [PATCH] fix up for "drm/fb-helper: Set framebuffer for vga-switcheroo clients" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/drm_fb_helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 97049a26fca2..5e445c61252d 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -1942,6 +1942,7 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper, int preferred_bpp) { struct drm_client_dev *client = &fb_helper->client; + struct drm_device *dev = fb_helper->dev; struct drm_fb_helper_surface_size sizes; int ret;