Re: [PATCH v6 22/23] hw/display: make ATI_VGA depend on PIXMAN

[Marc-André Lureau]

Hi

On Thu, Oct 26, 2023 at 1:07 AM BALATON Zoltan <balaton@eik.bme.hu> wrote:
>
> On Wed, 25 Oct 2023, marcandre.lureau@redhat.com wrote:
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > Acked-by: BALATON Zoltan <balaton@eik.bme.hu>
> > ---
> > configs/devices/mips64el-softmmu/default.mak | 2 +-
> > hw/display/Kconfig                           | 2 +-
> > hw/display/meson.build                       | 2 +-
> > 3 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/configs/devices/mips64el-softmmu/default.mak 
> > b/configs/devices/mips64el-softmmu/default.mak
> > index d5188f7ea5..8d85607571 100644
> > --- a/configs/devices/mips64el-softmmu/default.mak
> > +++ b/configs/devices/mips64el-softmmu/default.mak
> > @@ -3,7 +3,7 @@
> > include ../mips-softmmu/common.mak
> > CONFIG_FULOONG=y
> > CONFIG_LOONGSON3V=y
> > -CONFIG_ATI_VGA=y
> > +# CONFIG_ATI_VGA=n
>
> I think I've asked this before but forgot the answer... However fuloong2e
> has an on board ati-vga so does this (or should it) disable CONFIG_FULOONG
> when !PIXMAN? Or that machine should omit the on board graphics in this
> case?
>

yes, it is not obvious to spot, because it's a run time error (the
"ati-vga" device creation).

I think we should express this like that, but it fails with:
KconfigDataError: cycle found including PCI_BONITO

And I have no idea why. Paolo, any idea?

diff --git a/configs/devices/mips64el-softmmu/default.mak
b/configs/devices/mips64el-softmmu/default.mak
index 8d85607571..4d80d60511 100644
--- a/configs/devices/mips64el-softmmu/default.mak
+++ b/configs/devices/mips64el-softmmu/default.mak
@@ -1,9 +1,8 @@
 # Default configuration for mips64el-softmmu

 include ../mips-softmmu/common.mak
-CONFIG_FULOONG=y
+#CONFIG_FULOONG=y
 CONFIG_LOONGSON3V=y
-# CONFIG_ATI_VGA=n
 CONFIG_RTL8139_PCI=y
 CONFIG_JAZZ=y
 CONFIG_VT82C686=y
diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
index ac1eb06a51..48bb15fdd3 100644
--- a/hw/mips/Kconfig
+++ b/hw/mips/Kconfig
@@ -32,7 +32,9 @@ config JAZZ

 config FULOONG
     bool
+    default y if MIPS
     select PCI_BONITO
+    depends on ATI_VGA



> Regards,
> BALATON Zoltan
>
> > CONFIG_RTL8139_PCI=y
> > CONFIG_JAZZ=y
> > CONFIG_VT82C686=y
> > diff --git a/hw/display/Kconfig b/hw/display/Kconfig
> > index 1aafe1923d..4d8a6c4af8 100644
> > --- a/hw/display/Kconfig
> > +++ b/hw/display/Kconfig
> > @@ -125,7 +125,7 @@ config DPCD
> > config ATI_VGA
> >     bool
> >     default y if PCI_DEVICES
> > -    depends on PCI
> > +    depends on PCI && PIXMAN
> >     select VGA
> >     select BITBANG_I2C
> >     select DDC
> > diff --git a/hw/display/meson.build b/hw/display/meson.build
> > index 9c06aaee20..344dfe3d8c 100644
> > --- a/hw/display/meson.build
> > +++ b/hw/display/meson.build
> > @@ -62,7 +62,7 @@ system_ss.add(when: 'CONFIG_XLNX_DISPLAYPORT', if_true: 
> > files('xlnx_dp.c'))
> >
> > system_ss.add(when: 'CONFIG_ARTIST', if_true: files('artist.c'))
> >
> > -system_ss.add(when: [pixman, 'CONFIG_ATI_VGA'], if_true: files('ati.c', 
> > 'ati_2d.c', 'ati_dbg.c'))
> > +system_ss.add(when: 'CONFIG_ATI_VGA', if_true: [files('ati.c', 'ati_2d.c', 
> > 'ati_dbg.c'), pixman])
> >
> >
> > if config_all_devices.has_key('CONFIG_VIRTIO_GPU')
> >



-- 
Marc-André Lureau