Message ID | 20231010073830.606570-18-marcandre.lureau@redhat.com |
---|---|
State | Handled Elsewhere |
Headers | show |
Series | Make Pixman an optional dependency | expand |
On Tue, 10 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 > 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 14a57703d3..4a10040c19 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') >
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 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 14a57703d3..4a10040c19 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')