| Message ID | 2beec7645bac82e7bdef4f6df0b9f4fe28696575.1519053920.git.alifm@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 19.02.2018 16:47, Farhan Ali wrote: > The 'commit e25df1205f37 ("[S390] Kconfig: menus with depends on HAS_IOMEM.")' > added the HAS_IOMEM dependecy for "Graphics support". This disabled the > "Graphics support" menu for S390. But if we enable VT layer for S390, > we would also need to enable the dummy console. So let's remove the > HAS_IOMEM dependency. > > Move this dependency to sub menu items and console drivers that use > io memory. > > Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com> > --- > drivers/video/Kconfig | 21 +++++++++++---------- > drivers/video/console/Kconfig | 4 ++-- > 2 files changed, 13 insertions(+), 12 deletions(-) > > diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig > index 3c20af9..8f10915 100644 > --- a/drivers/video/Kconfig > +++ b/drivers/video/Kconfig > @@ -3,7 +3,6 @@ > # > > menu "Graphics support" > - depends on HAS_IOMEM > > config HAVE_FB_ATMEL > bool > @@ -11,20 +10,22 @@ config HAVE_FB_ATMEL > config SH_LCD_MIPI_DSI > bool > > -source "drivers/char/agp/Kconfig" > +if HAS_IOMEM > + source "drivers/char/agp/Kconfig" > > -source "drivers/gpu/vga/Kconfig" > + source "drivers/gpu/vga/Kconfig" > > -source "drivers/gpu/host1x/Kconfig" > -source "drivers/gpu/ipu-v3/Kconfig" > + source "drivers/gpu/host1x/Kconfig" > + source "drivers/gpu/ipu-v3/Kconfig" > > -source "drivers/gpu/drm/Kconfig" > + source "drivers/gpu/drm/Kconfig" > > -menu "Frame buffer Devices" > -source "drivers/video/fbdev/Kconfig" > -endmenu > + menu "Frame buffer Devices" > + source "drivers/video/fbdev/Kconfig" > + endmenu > > -source "drivers/video/backlight/Kconfig" > + source "drivers/video/backlight/Kconfig" > +endif > > config VGASTATE > tristate > diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig > index 7f1f1fb..0023b16 100644 > --- a/drivers/video/console/Kconfig > +++ b/drivers/video/console/Kconfig > @@ -85,7 +85,7 @@ config MDA_CONSOLE > > config SGI_NEWPORT_CONSOLE > tristate "SGI Newport Console support" > - depends on SGI_IP22 > + depends on SGI_IP22 && HAS_IOMEM > select FONT_SUPPORT > help > Say Y here if you want the console on the Newport aka XL graphics > @@ -153,7 +153,7 @@ config FRAMEBUFFER_CONSOLE_ROTATION > > config STI_CONSOLE > bool "STI text console" > - depends on PARISC > + depends on PARISC && HAS_IOMEM > select FONT_SUPPORT > default y > help > Maybe config VGA_CONSOLE should depend on HAS_IOMEM, too? I think you can hardly use a VGA card without IOMEM, can you? Anyway, this approach now looks reasonable to me, so either way, feel free to add my: Reviewed-by: Thomas Huth <thuth@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 02/19/2018 11:25 AM, Thomas Huth wrote: > On 19.02.2018 16:47, Farhan Ali wrote: >> The 'commit e25df1205f37 ("[S390] Kconfig: menus with depends on HAS_IOMEM.")' >> added the HAS_IOMEM dependecy for "Graphics support". This disabled the >> "Graphics support" menu for S390. But if we enable VT layer for S390, >> we would also need to enable the dummy console. So let's remove the >> HAS_IOMEM dependency. >> >> Move this dependency to sub menu items and console drivers that use >> io memory. >> >> Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com> >> --- >> drivers/video/Kconfig | 21 +++++++++++---------- >> drivers/video/console/Kconfig | 4 ++-- >> 2 files changed, 13 insertions(+), 12 deletions(-) >> >> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig >> index 3c20af9..8f10915 100644 >> --- a/drivers/video/Kconfig >> +++ b/drivers/video/Kconfig >> @@ -3,7 +3,6 @@ >> # >> >> menu "Graphics support" >> - depends on HAS_IOMEM >> >> config HAVE_FB_ATMEL >> bool >> @@ -11,20 +10,22 @@ config HAVE_FB_ATMEL >> config SH_LCD_MIPI_DSI >> bool >> >> -source "drivers/char/agp/Kconfig" >> +if HAS_IOMEM >> + source "drivers/char/agp/Kconfig" >> >> -source "drivers/gpu/vga/Kconfig" >> + source "drivers/gpu/vga/Kconfig" >> >> -source "drivers/gpu/host1x/Kconfig" >> -source "drivers/gpu/ipu-v3/Kconfig" >> + source "drivers/gpu/host1x/Kconfig" >> + source "drivers/gpu/ipu-v3/Kconfig" >> >> -source "drivers/gpu/drm/Kconfig" >> + source "drivers/gpu/drm/Kconfig" >> >> -menu "Frame buffer Devices" >> -source "drivers/video/fbdev/Kconfig" >> -endmenu >> + menu "Frame buffer Devices" >> + source "drivers/video/fbdev/Kconfig" >> + endmenu >> >> -source "drivers/video/backlight/Kconfig" >> + source "drivers/video/backlight/Kconfig" >> +endif >> >> config VGASTATE >> tristate >> diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig >> index 7f1f1fb..0023b16 100644 >> --- a/drivers/video/console/Kconfig >> +++ b/drivers/video/console/Kconfig >> @@ -85,7 +85,7 @@ config MDA_CONSOLE >> >> config SGI_NEWPORT_CONSOLE >> tristate "SGI Newport Console support" >> - depends on SGI_IP22 >> + depends on SGI_IP22 && HAS_IOMEM >> select FONT_SUPPORT >> help >> Say Y here if you want the console on the Newport aka XL graphics >> @@ -153,7 +153,7 @@ config FRAMEBUFFER_CONSOLE_ROTATION >> >> config STI_CONSOLE >> bool "STI text console" >> - depends on PARISC >> + depends on PARISC && HAS_IOMEM >> select FONT_SUPPORT >> default y >> help >> > > Maybe config VGA_CONSOLE should depend on HAS_IOMEM, too? I think you > can hardly use a VGA card without IOMEM, can you? True, you can't. And I did think of adding the dependency for VGA, but VGA already is fenced off by many (almost all) architectures and I wasn't sure if it would be necessary. But I can add it. > Anyway, this approach now looks reasonable to me, so either way, feel > free to add my: > > Reviewed-by: Thomas Huth <thuth@redhat.com> > Thank you so much for reviewing. Appreciate your feedback :) -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 02/19/2018 04:47 PM, Farhan Ali wrote: > The 'commit e25df1205f37 ("[S390] Kconfig: menus with depends on HAS_IOMEM.")' > added the HAS_IOMEM dependecy for "Graphics support". This disabled the > "Graphics support" menu for S390. But if we enable VT layer for S390, > we would also need to enable the dummy console. So let's remove the > HAS_IOMEM dependency. > > Move this dependency to sub menu items and console drivers that use > io memory. > > Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com> This patch is part of todays linux-next and so far no fallout was reported. Shall I take that patch via the s390kvm tree (then I would like to have an ack. Bart?) or is anybody on cc willing to take this? Christian > --- > drivers/video/Kconfig | 21 +++++++++++---------- > drivers/video/console/Kconfig | 4 ++-- > 2 files changed, 13 insertions(+), 12 deletions(-) > > diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig > index 3c20af9..8f10915 100644 > --- a/drivers/video/Kconfig > +++ b/drivers/video/Kconfig > @@ -3,7 +3,6 @@ > # > > menu "Graphics support" > - depends on HAS_IOMEM > > config HAVE_FB_ATMEL > bool > @@ -11,20 +10,22 @@ config HAVE_FB_ATMEL > config SH_LCD_MIPI_DSI > bool > > -source "drivers/char/agp/Kconfig" > +if HAS_IOMEM > + source "drivers/char/agp/Kconfig" > > -source "drivers/gpu/vga/Kconfig" > + source "drivers/gpu/vga/Kconfig" > > -source "drivers/gpu/host1x/Kconfig" > -source "drivers/gpu/ipu-v3/Kconfig" > + source "drivers/gpu/host1x/Kconfig" > + source "drivers/gpu/ipu-v3/Kconfig" > > -source "drivers/gpu/drm/Kconfig" > + source "drivers/gpu/drm/Kconfig" > > -menu "Frame buffer Devices" > -source "drivers/video/fbdev/Kconfig" > -endmenu > + menu "Frame buffer Devices" > + source "drivers/video/fbdev/Kconfig" > + endmenu > > -source "drivers/video/backlight/Kconfig" > + source "drivers/video/backlight/Kconfig" > +endif > > config VGASTATE > tristate > diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig > index 7f1f1fb..0023b16 100644 > --- a/drivers/video/console/Kconfig > +++ b/drivers/video/console/Kconfig > @@ -85,7 +85,7 @@ config MDA_CONSOLE > > config SGI_NEWPORT_CONSOLE > tristate "SGI Newport Console support" > - depends on SGI_IP22 > + depends on SGI_IP22 && HAS_IOMEM > select FONT_SUPPORT > help > Say Y here if you want the console on the Newport aka XL graphics > @@ -153,7 +153,7 @@ config FRAMEBUFFER_CONSOLE_ROTATION > > config STI_CONSOLE > bool "STI text console" > - depends on PARISC > + depends on PARISC && HAS_IOMEM > select FONT_SUPPORT > default y > help > -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 02/19/2018 05:38 PM, Farhan Ali wrote: > > > On 02/19/2018 11:25 AM, Thomas Huth wrote: >> On 19.02.2018 16:47, Farhan Ali wrote: >>> The 'commit e25df1205f37 ("[S390] Kconfig: menus with depends on HAS_IOMEM.")' >>> added the HAS_IOMEM dependecy for "Graphics support". This disabled the >>> "Graphics support" menu for S390. But if we enable VT layer for S390, >>> we would also need to enable the dummy console. So let's remove the >>> HAS_IOMEM dependency. >>> >>> Move this dependency to sub menu items and console drivers that use >>> io memory. >>> >>> Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com> >>> --- >>> drivers/video/Kconfig | 21 +++++++++++---------- >>> drivers/video/console/Kconfig | 4 ++-- >>> 2 files changed, 13 insertions(+), 12 deletions(-) >>> >>> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig >>> index 3c20af9..8f10915 100644 >>> --- a/drivers/video/Kconfig >>> +++ b/drivers/video/Kconfig >>> @@ -3,7 +3,6 @@ >>> # >>> menu "Graphics support" >>> - depends on HAS_IOMEM >>> config HAVE_FB_ATMEL >>> bool >>> @@ -11,20 +10,22 @@ config HAVE_FB_ATMEL >>> config SH_LCD_MIPI_DSI >>> bool >>> -source "drivers/char/agp/Kconfig" >>> +if HAS_IOMEM >>> + source "drivers/char/agp/Kconfig" >>> -source "drivers/gpu/vga/Kconfig" >>> + source "drivers/gpu/vga/Kconfig" >>> -source "drivers/gpu/host1x/Kconfig" >>> -source "drivers/gpu/ipu-v3/Kconfig" >>> + source "drivers/gpu/host1x/Kconfig" >>> + source "drivers/gpu/ipu-v3/Kconfig" >>> -source "drivers/gpu/drm/Kconfig" >>> + source "drivers/gpu/drm/Kconfig" Hmmm, looks like that this makes it impossible to select VIRTIO_GPU - need still more work. -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 02/21/2018 11:05 AM, Christian Borntraeger wrote: > > > On 02/19/2018 05:38 PM, Farhan Ali wrote: >> >> >> On 02/19/2018 11:25 AM, Thomas Huth wrote: >>> On 19.02.2018 16:47, Farhan Ali wrote: >>>> The 'commit e25df1205f37 ("[S390] Kconfig: menus with depends on HAS_IOMEM.")' >>>> added the HAS_IOMEM dependecy for "Graphics support". This disabled the >>>> "Graphics support" menu for S390. But if we enable VT layer for S390, >>>> we would also need to enable the dummy console. So let's remove the >>>> HAS_IOMEM dependency. >>>> >>>> Move this dependency to sub menu items and console drivers that use >>>> io memory. >>>> >>>> Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com> >>>> --- >>>> drivers/video/Kconfig | 21 +++++++++++---------- >>>> drivers/video/console/Kconfig | 4 ++-- >>>> 2 files changed, 13 insertions(+), 12 deletions(-) >>>> >>>> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig >>>> index 3c20af9..8f10915 100644 >>>> --- a/drivers/video/Kconfig >>>> +++ b/drivers/video/Kconfig >>>> @@ -3,7 +3,6 @@ >>>> # >>>> menu "Graphics support" >>>> - depends on HAS_IOMEM >>>> config HAVE_FB_ATMEL >>>> bool >>>> @@ -11,20 +10,22 @@ config HAVE_FB_ATMEL >>>> config SH_LCD_MIPI_DSI >>>> bool >>>> -source "drivers/char/agp/Kconfig" >>>> +if HAS_IOMEM >>>> + source "drivers/char/agp/Kconfig" >>>> -source "drivers/gpu/vga/Kconfig" >>>> + source "drivers/gpu/vga/Kconfig" >>>> -source "drivers/gpu/host1x/Kconfig" >>>> -source "drivers/gpu/ipu-v3/Kconfig" >>>> + source "drivers/gpu/host1x/Kconfig" >>>> + source "drivers/gpu/ipu-v3/Kconfig" >>>> -source "drivers/gpu/drm/Kconfig" >>>> + source "drivers/gpu/drm/Kconfig" > > > Hmmm, looks like that this makes it impossible to select VIRTIO_GPU - need still more > work. > Sorry my fault. I had CONFIG_PCI disabled. -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 21 Feb 2018 11:22:38 +0100 Christian Borntraeger <borntraeger@de.ibm.com> wrote: > On 02/21/2018 11:05 AM, Christian Borntraeger wrote: > > > > > > On 02/19/2018 05:38 PM, Farhan Ali wrote: > >> > >> > >> On 02/19/2018 11:25 AM, Thomas Huth wrote: > >>> On 19.02.2018 16:47, Farhan Ali wrote: > >>>> The 'commit e25df1205f37 ("[S390] Kconfig: menus with depends on HAS_IOMEM.")' > >>>> added the HAS_IOMEM dependecy for "Graphics support". This disabled the > >>>> "Graphics support" menu for S390. But if we enable VT layer for S390, > >>>> we would also need to enable the dummy console. So let's remove the > >>>> HAS_IOMEM dependency. > >>>> > >>>> Move this dependency to sub menu items and console drivers that use > >>>> io memory. > >>>> > >>>> Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com> > >>>> --- > >>>> drivers/video/Kconfig | 21 +++++++++++---------- > >>>> drivers/video/console/Kconfig | 4 ++-- > >>>> 2 files changed, 13 insertions(+), 12 deletions(-) > >>>> > >>>> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig > >>>> index 3c20af9..8f10915 100644 > >>>> --- a/drivers/video/Kconfig > >>>> +++ b/drivers/video/Kconfig > >>>> @@ -3,7 +3,6 @@ > >>>> # > >>>> menu "Graphics support" > >>>> - depends on HAS_IOMEM > >>>> config HAVE_FB_ATMEL > >>>> bool > >>>> @@ -11,20 +10,22 @@ config HAVE_FB_ATMEL > >>>> config SH_LCD_MIPI_DSI > >>>> bool > >>>> -source "drivers/char/agp/Kconfig" > >>>> +if HAS_IOMEM > >>>> + source "drivers/char/agp/Kconfig" > >>>> -source "drivers/gpu/vga/Kconfig" > >>>> + source "drivers/gpu/vga/Kconfig" > >>>> -source "drivers/gpu/host1x/Kconfig" > >>>> -source "drivers/gpu/ipu-v3/Kconfig" > >>>> + source "drivers/gpu/host1x/Kconfig" > >>>> + source "drivers/gpu/ipu-v3/Kconfig" > >>>> -source "drivers/gpu/drm/Kconfig" > >>>> + source "drivers/gpu/drm/Kconfig" > > > > > > Hmmm, looks like that this makes it impossible to select VIRTIO_GPU - need still more > > work. > > > Sorry my fault. I had CONFIG_PCI disabled. That smells like the s390 HAS_IOMEM stuff needs more work -- I guess that you want to enable a ccw virtio-gpu device, not a pci one, right? -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 02/21/2018 11:32 AM, Cornelia Huck wrote: > On Wed, 21 Feb 2018 11:22:38 +0100 > Christian Borntraeger <borntraeger@de.ibm.com> wrote: > >> On 02/21/2018 11:05 AM, Christian Borntraeger wrote: >>> >>> >>> On 02/19/2018 05:38 PM, Farhan Ali wrote: >>>> >>>> >>>> On 02/19/2018 11:25 AM, Thomas Huth wrote: >>>>> On 19.02.2018 16:47, Farhan Ali wrote: >>>>>> The 'commit e25df1205f37 ("[S390] Kconfig: menus with depends on HAS_IOMEM.")' >>>>>> added the HAS_IOMEM dependecy for "Graphics support". This disabled the >>>>>> "Graphics support" menu for S390. But if we enable VT layer for S390, >>>>>> we would also need to enable the dummy console. So let's remove the >>>>>> HAS_IOMEM dependency. >>>>>> >>>>>> Move this dependency to sub menu items and console drivers that use >>>>>> io memory. >>>>>> >>>>>> Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com> >>>>>> --- >>>>>> drivers/video/Kconfig | 21 +++++++++++---------- >>>>>> drivers/video/console/Kconfig | 4 ++-- >>>>>> 2 files changed, 13 insertions(+), 12 deletions(-) >>>>>> >>>>>> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig >>>>>> index 3c20af9..8f10915 100644 >>>>>> --- a/drivers/video/Kconfig >>>>>> +++ b/drivers/video/Kconfig >>>>>> @@ -3,7 +3,6 @@ >>>>>> # >>>>>> menu "Graphics support" >>>>>> - depends on HAS_IOMEM >>>>>> config HAVE_FB_ATMEL >>>>>> bool >>>>>> @@ -11,20 +10,22 @@ config HAVE_FB_ATMEL >>>>>> config SH_LCD_MIPI_DSI >>>>>> bool >>>>>> -source "drivers/char/agp/Kconfig" >>>>>> +if HAS_IOMEM >>>>>> + source "drivers/char/agp/Kconfig" >>>>>> -source "drivers/gpu/vga/Kconfig" >>>>>> + source "drivers/gpu/vga/Kconfig" >>>>>> -source "drivers/gpu/host1x/Kconfig" >>>>>> -source "drivers/gpu/ipu-v3/Kconfig" >>>>>> + source "drivers/gpu/host1x/Kconfig" >>>>>> + source "drivers/gpu/ipu-v3/Kconfig" >>>>>> -source "drivers/gpu/drm/Kconfig" >>>>>> + source "drivers/gpu/drm/Kconfig" >>> >>> >>> Hmmm, looks like that this makes it impossible to select VIRTIO_GPU - need still more >>> work. >>> >> Sorry my fault. I had CONFIG_PCI disabled. > > That smells like the s390 HAS_IOMEM stuff needs more work -- I guess > that you want to enable a ccw virtio-gpu device, not a pci one, right? It is a ccw virtio-gpu. But s390 has no IOMEM without CONFIG_PCI, so you cannot select VIRTIO_GPU, which needs DRM, which need IOMEM. In essence this patch is good enough to go forward and to build a sane .config (Usually any s390 distro kernel should enable CONFIG_PCI). -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 21.02.2018 12:09, Christian Borntraeger wrote: > > > On 02/21/2018 11:32 AM, Cornelia Huck wrote: >> On Wed, 21 Feb 2018 11:22:38 +0100 >> Christian Borntraeger <borntraeger@de.ibm.com> wrote: >> >>> On 02/21/2018 11:05 AM, Christian Borntraeger wrote: >>>> >>>> >>>> On 02/19/2018 05:38 PM, Farhan Ali wrote: >>>>> >>>>> >>>>> On 02/19/2018 11:25 AM, Thomas Huth wrote: >>>>>> On 19.02.2018 16:47, Farhan Ali wrote: >>>>>>> The 'commit e25df1205f37 ("[S390] Kconfig: menus with depends on HAS_IOMEM.")' >>>>>>> added the HAS_IOMEM dependecy for "Graphics support". This disabled the >>>>>>> "Graphics support" menu for S390. But if we enable VT layer for S390, >>>>>>> we would also need to enable the dummy console. So let's remove the >>>>>>> HAS_IOMEM dependency. >>>>>>> >>>>>>> Move this dependency to sub menu items and console drivers that use >>>>>>> io memory. >>>>>>> >>>>>>> Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com> >>>>>>> --- >>>>>>> drivers/video/Kconfig | 21 +++++++++++---------- >>>>>>> drivers/video/console/Kconfig | 4 ++-- >>>>>>> 2 files changed, 13 insertions(+), 12 deletions(-) >>>>>>> >>>>>>> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig >>>>>>> index 3c20af9..8f10915 100644 >>>>>>> --- a/drivers/video/Kconfig >>>>>>> +++ b/drivers/video/Kconfig >>>>>>> @@ -3,7 +3,6 @@ >>>>>>> # >>>>>>> menu "Graphics support" >>>>>>> - depends on HAS_IOMEM >>>>>>> config HAVE_FB_ATMEL >>>>>>> bool >>>>>>> @@ -11,20 +10,22 @@ config HAVE_FB_ATMEL >>>>>>> config SH_LCD_MIPI_DSI >>>>>>> bool >>>>>>> -source "drivers/char/agp/Kconfig" >>>>>>> +if HAS_IOMEM >>>>>>> + source "drivers/char/agp/Kconfig" >>>>>>> -source "drivers/gpu/vga/Kconfig" >>>>>>> + source "drivers/gpu/vga/Kconfig" >>>>>>> -source "drivers/gpu/host1x/Kconfig" >>>>>>> -source "drivers/gpu/ipu-v3/Kconfig" >>>>>>> + source "drivers/gpu/host1x/Kconfig" >>>>>>> + source "drivers/gpu/ipu-v3/Kconfig" >>>>>>> -source "drivers/gpu/drm/Kconfig" >>>>>>> + source "drivers/gpu/drm/Kconfig" >>>> >>>> >>>> Hmmm, looks like that this makes it impossible to select VIRTIO_GPU - need still more >>>> work. >>>> >>> Sorry my fault. I had CONFIG_PCI disabled. >> >> That smells like the s390 HAS_IOMEM stuff needs more work -- I guess >> that you want to enable a ccw virtio-gpu device, not a pci one, right? > > It is a ccw virtio-gpu. But s390 has no IOMEM without CONFIG_PCI, so you cannot > select VIRTIO_GPU, which needs DRM, which need IOMEM. So the 'source "drivers/gpu/drm/Kconfig"' should maybe rather reside outside of the "if HAS_IOMEM" path? Or does it not compile anymore that way? Thomas -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 02/21/2018 12:14 PM, Thomas Huth wrote: > On 21.02.2018 12:09, Christian Borntraeger wrote: >> >> >> On 02/21/2018 11:32 AM, Cornelia Huck wrote: >>> On Wed, 21 Feb 2018 11:22:38 +0100 >>> Christian Borntraeger <borntraeger@de.ibm.com> wrote: >>> >>>> On 02/21/2018 11:05 AM, Christian Borntraeger wrote: >>>>> >>>>> >>>>> On 02/19/2018 05:38 PM, Farhan Ali wrote: >>>>>> >>>>>> >>>>>> On 02/19/2018 11:25 AM, Thomas Huth wrote: >>>>>>> On 19.02.2018 16:47, Farhan Ali wrote: >>>>>>>> The 'commit e25df1205f37 ("[S390] Kconfig: menus with depends on HAS_IOMEM.")' >>>>>>>> added the HAS_IOMEM dependecy for "Graphics support". This disabled the >>>>>>>> "Graphics support" menu for S390. But if we enable VT layer for S390, >>>>>>>> we would also need to enable the dummy console. So let's remove the >>>>>>>> HAS_IOMEM dependency. >>>>>>>> >>>>>>>> Move this dependency to sub menu items and console drivers that use >>>>>>>> io memory. >>>>>>>> >>>>>>>> Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com> >>>>>>>> --- >>>>>>>> drivers/video/Kconfig | 21 +++++++++++---------- >>>>>>>> drivers/video/console/Kconfig | 4 ++-- >>>>>>>> 2 files changed, 13 insertions(+), 12 deletions(-) >>>>>>>> >>>>>>>> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig >>>>>>>> index 3c20af9..8f10915 100644 >>>>>>>> --- a/drivers/video/Kconfig >>>>>>>> +++ b/drivers/video/Kconfig >>>>>>>> @@ -3,7 +3,6 @@ >>>>>>>> # >>>>>>>> menu "Graphics support" >>>>>>>> - depends on HAS_IOMEM >>>>>>>> config HAVE_FB_ATMEL >>>>>>>> bool >>>>>>>> @@ -11,20 +10,22 @@ config HAVE_FB_ATMEL >>>>>>>> config SH_LCD_MIPI_DSI >>>>>>>> bool >>>>>>>> -source "drivers/char/agp/Kconfig" >>>>>>>> +if HAS_IOMEM >>>>>>>> + source "drivers/char/agp/Kconfig" >>>>>>>> -source "drivers/gpu/vga/Kconfig" >>>>>>>> + source "drivers/gpu/vga/Kconfig" >>>>>>>> -source "drivers/gpu/host1x/Kconfig" >>>>>>>> -source "drivers/gpu/ipu-v3/Kconfig" >>>>>>>> + source "drivers/gpu/host1x/Kconfig" >>>>>>>> + source "drivers/gpu/ipu-v3/Kconfig" >>>>>>>> -source "drivers/gpu/drm/Kconfig" >>>>>>>> + source "drivers/gpu/drm/Kconfig" >>>>> >>>>> >>>>> Hmmm, looks like that this makes it impossible to select VIRTIO_GPU - need still more >>>>> work. >>>>> >>>> Sorry my fault. I had CONFIG_PCI disabled. >>> >>> That smells like the s390 HAS_IOMEM stuff needs more work -- I guess >>> that you want to enable a ccw virtio-gpu device, not a pci one, right? >> >> It is a ccw virtio-gpu. But s390 has no IOMEM without CONFIG_PCI, so you cannot >> select VIRTIO_GPU, which needs DRM, which need IOMEM. > > So the 'source "drivers/gpu/drm/Kconfig"' should maybe rather reside > outside of the "if HAS_IOMEM" path? Or does it not compile anymore that way? virtio-gpu depends on drm. So in essence it boils down to if you want virtio-gpu you also need to enable PCI, even if the actual channel is ccw. -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 21 Feb 2018 12:14:36 +0100 Thomas Huth <thuth@redhat.com> wrote: > On 21.02.2018 12:09, Christian Borntraeger wrote: > > > > > > On 02/21/2018 11:32 AM, Cornelia Huck wrote: > >> On Wed, 21 Feb 2018 11:22:38 +0100 > >> Christian Borntraeger <borntraeger@de.ibm.com> wrote: > >> > >>> On 02/21/2018 11:05 AM, Christian Borntraeger wrote: > >>>> > >>>> > >>>> On 02/19/2018 05:38 PM, Farhan Ali wrote: > >>>>> > >>>>> > >>>>> On 02/19/2018 11:25 AM, Thomas Huth wrote: > >>>>>> On 19.02.2018 16:47, Farhan Ali wrote: > >>>>>>> The 'commit e25df1205f37 ("[S390] Kconfig: menus with depends on HAS_IOMEM.")' > >>>>>>> added the HAS_IOMEM dependecy for "Graphics support". This disabled the > >>>>>>> "Graphics support" menu for S390. But if we enable VT layer for S390, > >>>>>>> we would also need to enable the dummy console. So let's remove the > >>>>>>> HAS_IOMEM dependency. > >>>>>>> > >>>>>>> Move this dependency to sub menu items and console drivers that use > >>>>>>> io memory. > >>>>>>> > >>>>>>> Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com> > >>>>>>> --- > >>>>>>> drivers/video/Kconfig | 21 +++++++++++---------- > >>>>>>> drivers/video/console/Kconfig | 4 ++-- > >>>>>>> 2 files changed, 13 insertions(+), 12 deletions(-) > >>>>>>> > >>>>>>> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig > >>>>>>> index 3c20af9..8f10915 100644 > >>>>>>> --- a/drivers/video/Kconfig > >>>>>>> +++ b/drivers/video/Kconfig > >>>>>>> @@ -3,7 +3,6 @@ > >>>>>>> # > >>>>>>> menu "Graphics support" > >>>>>>> - depends on HAS_IOMEM > >>>>>>> config HAVE_FB_ATMEL > >>>>>>> bool > >>>>>>> @@ -11,20 +10,22 @@ config HAVE_FB_ATMEL > >>>>>>> config SH_LCD_MIPI_DSI > >>>>>>> bool > >>>>>>> -source "drivers/char/agp/Kconfig" > >>>>>>> +if HAS_IOMEM > >>>>>>> + source "drivers/char/agp/Kconfig" > >>>>>>> -source "drivers/gpu/vga/Kconfig" > >>>>>>> + source "drivers/gpu/vga/Kconfig" > >>>>>>> -source "drivers/gpu/host1x/Kconfig" > >>>>>>> -source "drivers/gpu/ipu-v3/Kconfig" > >>>>>>> + source "drivers/gpu/host1x/Kconfig" > >>>>>>> + source "drivers/gpu/ipu-v3/Kconfig" > >>>>>>> -source "drivers/gpu/drm/Kconfig" > >>>>>>> + source "drivers/gpu/drm/Kconfig" > >>>> > >>>> > >>>> Hmmm, looks like that this makes it impossible to select VIRTIO_GPU - need still more > >>>> work. > >>>> > >>> Sorry my fault. I had CONFIG_PCI disabled. > >> > >> That smells like the s390 HAS_IOMEM stuff needs more work -- I guess > >> that you want to enable a ccw virtio-gpu device, not a pci one, right? > > > > It is a ccw virtio-gpu. But s390 has no IOMEM without CONFIG_PCI, so you cannot > > select VIRTIO_GPU, which needs DRM, which need IOMEM. > > So the 'source "drivers/gpu/drm/Kconfig"' should maybe rather reside > outside of the "if HAS_IOMEM" path? Or does it not compile anymore that way? Alternatively, some of the IOMEM stuff could be moved out from under the pci dependency on s390 (not sure what is needed and what actually makes sense.) This is good enough for now, but it would be nice to get this sorted out later. -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 21.02.2018 12:22, Christian Borntraeger wrote: > > > On 02/21/2018 12:14 PM, Thomas Huth wrote: >> On 21.02.2018 12:09, Christian Borntraeger wrote: >>> >>> >>> On 02/21/2018 11:32 AM, Cornelia Huck wrote: >>>> On Wed, 21 Feb 2018 11:22:38 +0100 >>>> Christian Borntraeger <borntraeger@de.ibm.com> wrote: >>>> >>>>> On 02/21/2018 11:05 AM, Christian Borntraeger wrote: >>>>>> >>>>>> >>>>>> On 02/19/2018 05:38 PM, Farhan Ali wrote: >>>>>>> >>>>>>> >>>>>>> On 02/19/2018 11:25 AM, Thomas Huth wrote: >>>>>>>> On 19.02.2018 16:47, Farhan Ali wrote: >>>>>>>>> The 'commit e25df1205f37 ("[S390] Kconfig: menus with depends on HAS_IOMEM.")' >>>>>>>>> added the HAS_IOMEM dependecy for "Graphics support". This disabled the >>>>>>>>> "Graphics support" menu for S390. But if we enable VT layer for S390, >>>>>>>>> we would also need to enable the dummy console. So let's remove the >>>>>>>>> HAS_IOMEM dependency. >>>>>>>>> >>>>>>>>> Move this dependency to sub menu items and console drivers that use >>>>>>>>> io memory. >>>>>>>>> >>>>>>>>> Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com> >>>>>>>>> --- >>>>>>>>> drivers/video/Kconfig | 21 +++++++++++---------- >>>>>>>>> drivers/video/console/Kconfig | 4 ++-- >>>>>>>>> 2 files changed, 13 insertions(+), 12 deletions(-) >>>>>>>>> >>>>>>>>> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig >>>>>>>>> index 3c20af9..8f10915 100644 >>>>>>>>> --- a/drivers/video/Kconfig >>>>>>>>> +++ b/drivers/video/Kconfig >>>>>>>>> @@ -3,7 +3,6 @@ >>>>>>>>> # >>>>>>>>> menu "Graphics support" >>>>>>>>> - depends on HAS_IOMEM >>>>>>>>> config HAVE_FB_ATMEL >>>>>>>>> bool >>>>>>>>> @@ -11,20 +10,22 @@ config HAVE_FB_ATMEL >>>>>>>>> config SH_LCD_MIPI_DSI >>>>>>>>> bool >>>>>>>>> -source "drivers/char/agp/Kconfig" >>>>>>>>> +if HAS_IOMEM >>>>>>>>> + source "drivers/char/agp/Kconfig" >>>>>>>>> -source "drivers/gpu/vga/Kconfig" >>>>>>>>> + source "drivers/gpu/vga/Kconfig" >>>>>>>>> -source "drivers/gpu/host1x/Kconfig" >>>>>>>>> -source "drivers/gpu/ipu-v3/Kconfig" >>>>>>>>> + source "drivers/gpu/host1x/Kconfig" >>>>>>>>> + source "drivers/gpu/ipu-v3/Kconfig" >>>>>>>>> -source "drivers/gpu/drm/Kconfig" >>>>>>>>> + source "drivers/gpu/drm/Kconfig" >>>>>> >>>>>> >>>>>> Hmmm, looks like that this makes it impossible to select VIRTIO_GPU - need still more >>>>>> work. >>>>>> >>>>> Sorry my fault. I had CONFIG_PCI disabled. >>>> >>>> That smells like the s390 HAS_IOMEM stuff needs more work -- I guess >>>> that you want to enable a ccw virtio-gpu device, not a pci one, right? >>> >>> It is a ccw virtio-gpu. But s390 has no IOMEM without CONFIG_PCI, so you cannot >>> select VIRTIO_GPU, which needs DRM, which need IOMEM. >> >> So the 'source "drivers/gpu/drm/Kconfig"' should maybe rather reside >> outside of the "if HAS_IOMEM" path? Or does it not compile anymore that way? > > virtio-gpu depends on drm. So in essence it boils down to if you want virtio-gpu > you also need to enable PCI, even if the actual channel is ccw. But if you need to enable PCI to get IOMEM, I wonder why this patch here is needed at all? The Graphics menu / VT dummy console should be available in the config if IOMEM is enabled anyway? Thomas -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wednesday, February 21, 2018 09:44:43 AM Christian Borntraeger wrote: > > On 02/19/2018 04:47 PM, Farhan Ali wrote: > > The 'commit e25df1205f37 ("[S390] Kconfig: menus with depends on HAS_IOMEM.")' > > added the HAS_IOMEM dependecy for "Graphics support". This disabled the > > "Graphics support" menu for S390. But if we enable VT layer for S390, > > we would also need to enable the dummy console. So let's remove the > > HAS_IOMEM dependency. > > > > Move this dependency to sub menu items and console drivers that use > > io memory. > > > > Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com> > > This patch is part of todays linux-next and so far no fallout was reported. > Shall I take that patch via the s390kvm tree (then I would like to have > an ack. Bart?) or is anybody on cc willing to take this? I would like to see two things changed before acking this patch: - add missing HAS_IOMEM dependency to VGA_CONSOLE - extend "if HAS_IOMEM" in drivers/video/Kconfig to cover config items previously covered by this dependency (it should start before config HAVE_FB_ATMEL and end after config HDMI) > Christian > > > > > --- > > drivers/video/Kconfig | 21 +++++++++++---------- > > drivers/video/console/Kconfig | 4 ++-- > > 2 files changed, 13 insertions(+), 12 deletions(-) > > > > diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig > > index 3c20af9..8f10915 100644 > > --- a/drivers/video/Kconfig > > +++ b/drivers/video/Kconfig > > @@ -3,7 +3,6 @@ > > # > > > > menu "Graphics support" > > - depends on HAS_IOMEM > > > > config HAVE_FB_ATMEL > > bool > > @@ -11,20 +10,22 @@ config HAVE_FB_ATMEL > > config SH_LCD_MIPI_DSI > > bool > > > > -source "drivers/char/agp/Kconfig" > > +if HAS_IOMEM > > + source "drivers/char/agp/Kconfig" > > > > -source "drivers/gpu/vga/Kconfig" > > + source "drivers/gpu/vga/Kconfig" > > > > -source "drivers/gpu/host1x/Kconfig" > > -source "drivers/gpu/ipu-v3/Kconfig" > > + source "drivers/gpu/host1x/Kconfig" > > + source "drivers/gpu/ipu-v3/Kconfig" > > > > -source "drivers/gpu/drm/Kconfig" > > + source "drivers/gpu/drm/Kconfig" > > > > -menu "Frame buffer Devices" > > -source "drivers/video/fbdev/Kconfig" > > -endmenu > > + menu "Frame buffer Devices" > > + source "drivers/video/fbdev/Kconfig" > > + endmenu > > > > -source "drivers/video/backlight/Kconfig" > > + source "drivers/video/backlight/Kconfig" > > +endif > > > > config VGASTATE > > tristate > > diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig > > index 7f1f1fb..0023b16 100644 > > --- a/drivers/video/console/Kconfig > > +++ b/drivers/video/console/Kconfig > > @@ -85,7 +85,7 @@ config MDA_CONSOLE > > > > config SGI_NEWPORT_CONSOLE > > tristate "SGI Newport Console support" > > - depends on SGI_IP22 > > + depends on SGI_IP22 && HAS_IOMEM > > select FONT_SUPPORT > > help > > Say Y here if you want the console on the Newport aka XL graphics > > @@ -153,7 +153,7 @@ config FRAMEBUFFER_CONSOLE_ROTATION > > > > config STI_CONSOLE > > bool "STI text console" > > - depends on PARISC > > + depends on PARISC && HAS_IOMEM > > select FONT_SUPPORT > > default y > > help Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 3c20af9..8f10915 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -3,7 +3,6 @@ # menu "Graphics support" - depends on HAS_IOMEM config HAVE_FB_ATMEL bool @@ -11,20 +10,22 @@ config HAVE_FB_ATMEL config SH_LCD_MIPI_DSI bool -source "drivers/char/agp/Kconfig" +if HAS_IOMEM + source "drivers/char/agp/Kconfig" -source "drivers/gpu/vga/Kconfig" + source "drivers/gpu/vga/Kconfig" -source "drivers/gpu/host1x/Kconfig" -source "drivers/gpu/ipu-v3/Kconfig" + source "drivers/gpu/host1x/Kconfig" + source "drivers/gpu/ipu-v3/Kconfig" -source "drivers/gpu/drm/Kconfig" + source "drivers/gpu/drm/Kconfig" -menu "Frame buffer Devices" -source "drivers/video/fbdev/Kconfig" -endmenu + menu "Frame buffer Devices" + source "drivers/video/fbdev/Kconfig" + endmenu -source "drivers/video/backlight/Kconfig" + source "drivers/video/backlight/Kconfig" +endif config VGASTATE tristate diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index 7f1f1fb..0023b16 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -85,7 +85,7 @@ config MDA_CONSOLE config SGI_NEWPORT_CONSOLE tristate "SGI Newport Console support" - depends on SGI_IP22 + depends on SGI_IP22 && HAS_IOMEM select FONT_SUPPORT help Say Y here if you want the console on the Newport aka XL graphics @@ -153,7 +153,7 @@ config FRAMEBUFFER_CONSOLE_ROTATION config STI_CONSOLE bool "STI text console" - depends on PARISC + depends on PARISC && HAS_IOMEM select FONT_SUPPORT default y help
The 'commit e25df1205f37 ("[S390] Kconfig: menus with depends on HAS_IOMEM.")' added the HAS_IOMEM dependecy for "Graphics support". This disabled the "Graphics support" menu for S390. But if we enable VT layer for S390, we would also need to enable the dummy console. So let's remove the HAS_IOMEM dependency. Move this dependency to sub menu items and console drivers that use io memory. Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com> --- drivers/video/Kconfig | 21 +++++++++++---------- drivers/video/console/Kconfig | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-)