| Message ID | 20231107071915.2459115-21-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Make Pixman an optional dependency | expand |
Hi Marc-André, On 7/11/23 08:19, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > The Display Port has some strong PIXMAN dependency. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > Reviewed-by: Thomas Huth <thuth@redhat.com> > --- > hw/arm/Kconfig | 3 ++- > hw/display/Kconfig | 5 +++++ > hw/display/meson.build | 2 +- > 3 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > index e35007ed41..8ce288a40c 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -451,7 +451,7 @@ config STM32F405_SOC > config XLNX_ZYNQMP_ARM > bool > default y > - depends on TCG && AARCH64 > + depends on TCG && AARCH64 && PIXMAN NACK, this should be: -- >8 -- config XLNX_ZYNQMP_ARM bool - default y + default y if PIXMAN depends on TCG && AARCH64 select AHCI select ARM_GIC --- > select AHCI > select ARM_GIC > select CADENCE > @@ -463,6 +463,7 @@ config XLNX_ZYNQMP_ARM > select XILINX_AXI > select XILINX_SPIPS > select XLNX_CSU_DMA > + select XLNX_DISPLAYPORT OK. > select XLNX_ZYNQMP > select XLNX_ZDMA > select USB_DWC3 > diff --git a/hw/display/Kconfig b/hw/display/Kconfig > index 4d8b0cec40..1aafe1923d 100644 > --- a/hw/display/Kconfig > +++ b/hw/display/Kconfig > @@ -134,3 +134,8 @@ config MACFB > bool > select FRAMEBUFFER > depends on NUBUS > + > +config XLNX_DISPLAYPORT > + bool > + # defaults to "N", enabled by specific boards > + depends on PIXMAN OK (XLNX_ZYNQMP_ARM gets the dependency from here). Conditional to using "default y if PIXMAN": Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index e35007ed41..8ce288a40c 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -451,7 +451,7 @@ config STM32F405_SOC config XLNX_ZYNQMP_ARM bool default y - depends on TCG && AARCH64 + depends on TCG && AARCH64 && PIXMAN select AHCI select ARM_GIC select CADENCE @@ -463,6 +463,7 @@ config XLNX_ZYNQMP_ARM select XILINX_AXI select XILINX_SPIPS select XLNX_CSU_DMA + select XLNX_DISPLAYPORT select XLNX_ZYNQMP select XLNX_ZDMA select USB_DWC3 diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 4d8b0cec40..1aafe1923d 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -134,3 +134,8 @@ config MACFB bool select FRAMEBUFFER depends on NUBUS + +config XLNX_DISPLAYPORT + bool + # defaults to "N", enabled by specific boards + depends on PIXMAN diff --git a/hw/display/meson.build b/hw/display/meson.build index 2b64fd9f9d..9c06aaee20 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -58,7 +58,7 @@ if config_all_devices.has_key('CONFIG_QXL') endif system_ss.add(when: 'CONFIG_DPCD', if_true: files('dpcd.c')) -system_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dp.c')) +system_ss.add(when: 'CONFIG_XLNX_DISPLAYPORT', if_true: files('xlnx_dp.c')) system_ss.add(when: 'CONFIG_ARTIST', if_true: files('artist.c'))