| Message ID | 20221110111036.63cb67d1@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: build failure after merge of the drm-misc tree | expand |
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index a19f18b251f3..80f154b6adab 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -34,6 +34,7 @@ #include <drm/drm_crtc_helper.h> #include <drm/drm_drv.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_fbdev_generic.h> #include <drm/drm_gem_ttm_helper.h> #include <drm/drm_ioctl.h> #include <drm/drm_vblank.h>
Hi all, After merging the drm-misc tree, today's linux-next build (arm multi_v7_defconfig) failed like this: drivers/gpu/drm/nouveau/nouveau_drm.c: In function 'nouveau_drm_probe': drivers/gpu/drm/nouveau/nouveau_drm.c:797:17: error: implicit declaration of function 'drm_fbdev_generic_setup' [-Werror=implicit-function-declaration] 797 | drm_fbdev_generic_setup(drm_dev, 8); | ^~~~~~~~~~~~~~~~~~~~~~~ Caused by commit 8ab59da26bc0 ("drm/fb-helper: Move generic fbdev emulation into separate source file") interacting with commit 4a16dd9d18a0 ("drm/nouveau/kms: switch to drm fbdev helpers") from the drm tree. I have applied the following merge fix patch for today. From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Thu, 10 Nov 2022 11:05:52 +1100 Subject: [PATCH] drm-misc: fix up for "drm/fb-helper: Move generic fbdev emulation into separate source file" Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/gpu/drm/nouveau/nouveau_drm.c | 1 + 1 file changed, 1 insertion(+)