| Message ID | 20220610085450.1341880-1-javierm@redhat.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Headers | show |
| Series | Revert "fbdev: vesafb: Allow to be built if COMPILE_TEST is enabled" | expand |
On Fri, Jun 10, 2022 at 10:54:50AM +0200, Javier Martinez Canillas wrote: > This reverts commit fa0e256450f27a7d85f65c63f05e6897954a1d53. The kernel > test robot reported that attempting to build the vesafb driver fails on > some architectures, because these don't define a `struct screen_info`. > > This leads to linking errors, for example on parisc with allyesconfig: > > hppa-linux-ld: drivers/video/fbdev/vesafb.o: in function `vesafb_probe': > >> (.text+0x738): undefined reference to `screen_info' > >> hppa-linux-ld: (.text+0x73c): undefined reference to `screen_info' > hppa-linux-ld: drivers/firmware/sysfb.o: in function `sysfb_init': > >> (.init.text+0x28): undefined reference to `screen_info' > >> hppa-linux-ld: (.init.text+0x30): undefined reference to `screen_info' > hppa-linux-ld: (.init.text+0x78): undefined reference to `screen_info' > > The goal of commit fa0e256450f2 ("fbdev: vesafb: Allow to be built if > COMPILE_TEST is enabled") was to have more build coverage for the driver > but it wrongly assumed that all architectures would define a screen_info. > > Reported-by: kernel test robot <lkp@intel.com> > Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > > drivers/video/fbdev/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig > index bd849013f16f..f2a6b81e45c4 100644 > --- a/drivers/video/fbdev/Kconfig > +++ b/drivers/video/fbdev/Kconfig > @@ -616,7 +616,7 @@ config FB_UVESA > > config FB_VESA > bool "VESA VGA graphics support" > - depends on (FB = y) && (X86 || COMPILE_TEST) > + depends on (FB = y) && X86 > select FB_CFB_FILLRECT > select FB_CFB_COPYAREA > select FB_CFB_IMAGEBLIT > -- > 2.36.1 >
On 6/10/22 11:47, Daniel Vetter wrote: > On Fri, Jun 10, 2022 at 10:54:50AM +0200, Javier Martinez Canillas wrote: >> This reverts commit fa0e256450f27a7d85f65c63f05e6897954a1d53. The kernel >> test robot reported that attempting to build the vesafb driver fails on >> some architectures, because these don't define a `struct screen_info`. >> >> This leads to linking errors, for example on parisc with allyesconfig: >> >> hppa-linux-ld: drivers/video/fbdev/vesafb.o: in function `vesafb_probe': >>>> (.text+0x738): undefined reference to `screen_info' >>>> hppa-linux-ld: (.text+0x73c): undefined reference to `screen_info' >> hppa-linux-ld: drivers/firmware/sysfb.o: in function `sysfb_init': >>>> (.init.text+0x28): undefined reference to `screen_info' >>>> hppa-linux-ld: (.init.text+0x30): undefined reference to `screen_info' >> hppa-linux-ld: (.init.text+0x78): undefined reference to `screen_info' >> >> The goal of commit fa0e256450f2 ("fbdev: vesafb: Allow to be built if >> COMPILE_TEST is enabled") was to have more build coverage for the driver >> but it wrongly assumed that all architectures would define a screen_info. >> >> Reported-by: kernel test robot <lkp@intel.com> >> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> > > Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Pushed to drm-misc (drm-misc-next). Thanks!
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index bd849013f16f..f2a6b81e45c4 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -616,7 +616,7 @@ config FB_UVESA config FB_VESA bool "VESA VGA graphics support" - depends on (FB = y) && (X86 || COMPILE_TEST) + depends on (FB = y) && X86 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT