From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@redhat.com>, Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Intel Graphics <intel-gfx@lists.freedesktop.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [Intel-gfx] linux-next: build failure after merge of the drm tree
Date: Thu, 19 Jan 2023 13:12:22 +1100 [thread overview]
Message-ID: <20230119131222.4b7697c1@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 3631 bytes --]
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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
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;
--
2.35.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-01-19 2:12 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 2:12 Stephen Rothwell [this message]
2023-01-19 2:34 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for linux-next: build failure after merge of the drm tree Patchwork
2023-01-19 3:04 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-01-19 22:15 ` [Intel-gfx] " Rodrigo Vivi
2023-01-20 1:35 ` [Intel-gfx] ✓ Fi.CI.IGT: success for " Patchwork
[not found] <20210820123348.6535a87e@canb.auug.org.au>
[not found] ` <CAK7LNASv-F1Y7kpaDF+_=TW0Jzvpo1uuNL1B5jUmCCRqv-45bA@mail.gmail.com>
[not found] ` <20210902075038.7461d3c8@canb.auug.org.au>
[not found] ` <20210906084947.4f65761d@canb.auug.org.au>
2021-09-06 7:34 ` [Intel-gfx] " Daniel Vetter
2021-09-08 3:13 ` Masahiro Yamada
2021-09-08 9:07 ` Daniel Vetter
[not found] <20210108115518.2b3fdf58@canb.auug.org.au>
2021-01-08 1:25 ` Stephen Rothwell
2021-01-10 23:56 ` Stephen Rothwell
2021-01-18 0:59 ` Stephen Rothwell
2021-01-18 1:06 ` Dave Airlie
2021-01-20 12:12 ` Daniel Vetter
2021-01-20 20:44 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2020-12-09 1:53 Stephen Rothwell
2020-05-08 4:29 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230119131222.4b7697c1@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@redhat.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).