Merge remote-tracking branch 'remotes/stsquad/tags/pull-gitdm-next-271019-1' into...

[mirror_qemu.git] / hw / display / Kconfig

diff --git a/hw/display/Kconfig b/hw/display/Kconfig
index 86c1d544c5ce320eacef874fe4250aeb249665e4..c500d1fc6d6ec3646cbe4185b7fffa87159d678d 100644 (file)
--- a/hw/display/Kconfig
+++ b/hw/display/Kconfig
@@ -1,3 +1,8 @@
+config DDC
+    bool
+    depends on I2C
+    select EDID
+
 config EDID
     bool
 
@@ -21,10 +26,12 @@ config JAZZ_LED
 
 config PL110
     bool
+    select FRAMEBUFFER
 
 config SII9022
     bool
     depends on I2C
+    select DDC
 
 config SSD0303
     bool
@@ -100,15 +107,33 @@ config VIRTIO_GPU
 
 config VIRTIO_VGA
     bool
-    default y if PCI_DEVICES
+    # defaults to "N", enabled by specific boards
     depends on VIRTIO_PCI
     select VGA
 
+config VHOST_USER_GPU
+    bool
+    default y
+    depends on VIRTIO_GPU && VHOST_USER
+
+config VHOST_USER_VGA
+    bool
+    default y
+    depends on VIRTIO_VGA && VHOST_USER_GPU
+
 config DPCD
     bool
+    select AUX
 
 config ATI_VGA
     bool
     default y if PCI_DEVICES
     depends on PCI
     select VGA
+    select BITBANG_I2C
+    select DDC
+
+config MACFB
+    bool
+    select FRAMEBUFFER
+    depends on NUBUS