Re: [PULL v2 22/24] hw/display: make ATI_VGA depend on PIXMAN

[BALATON Zoltan]

On Mon, 6 Nov 2023, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> To avoid a kconfig cycle, change "depends on PCI" to "select PCI".
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Acked-by: BALATON Zoltan <balaton@eik.bme.hu>

Now I NACK it. I've sent a series that adds fallbacks to ati-vga without 
pixman so it does not need to be disabled. This series should be rebased 
on that then this patch and the fuloong one can be dropped. Could you 
please try to do that?

Regards,
BALATON Zoltan

> ---
> configs/devices/mips64el-softmmu/default.mak | 3 +--
> hw/display/Kconfig                           | 3 ++-
> hw/display/meson.build                       | 2 +-
> hw/mips/Kconfig                              | 2 ++
> 4 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/configs/devices/mips64el-softmmu/default.mak 
> b/configs/devices/mips64el-softmmu/default.mak
> index d5188f7ea5..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=y
> CONFIG_RTL8139_PCI=y
> CONFIG_JAZZ=y
> CONFIG_VT82C686=y
> diff --git a/hw/display/Kconfig b/hw/display/Kconfig
> index 1aafe1923d..8219225a1c 100644
> --- a/hw/display/Kconfig
> +++ b/hw/display/Kconfig
> @@ -125,7 +125,8 @@ config DPCD
> config ATI_VGA
>     bool
>     default y if PCI_DEVICES
> -    depends on PCI
> +    depends on PIXMAN
> +    select PCI
>     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')
> diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
> index ac1eb06a51..5d40795c0b 100644
> --- a/hw/mips/Kconfig
> +++ b/hw/mips/Kconfig
> @@ -32,7 +32,9 @@ config JAZZ
>
> config FULOONG
>     bool
> +    default y if MIPS64
>     select PCI_BONITO
> +    depends on ATI_VGA
>
> config LOONGSON3V
>     bool