ati-vga: Allow setting EDID parameters directly
The EDID generation has some parameters that can be set via properties but since ati-vga uses i2c-ddc it is only accessible with -global option. Expose these properties so users can more easily set it via e.g. -device ati-vga,xres=1024,yres=768. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Message-ID: <20260305233717.1D08F5969F6@zero.eik.bme.hu> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
BALATON Zoltan committed
Mar 6, 2026 at 00:37 UTC
1dacf5b9ab0c1aecc0751deafe07b029c78e02b5
2 files changed
+10
-5
hw/display/ati.c
+8
-5
@@ -28,7 +28,6 @@
28
#include "qemu/error-report.h"
29
#include "qapi/error.h"
30
#include "ui/console.h"
31
-#include "hw/display/i2c-ddc.h"
31
#include "trace.h"
32
33
#define ATI_DEBUG_HW_CURSOR 0
@@ -1039,6 +1038,7 @@ static void ati_vga_realize(PCIDevice *dev, Error **errp)
1038
{
1039
ATIVGAState *s = ATI_VGA(dev);
1040
VGACommonState *vga = &s->vga;
1041
+ I2CBus *i2cbus;
1042
uint64_t aper_size;
1043
1044
#ifndef CONFIG_PIXMAN
@@ -1087,11 +1087,10 @@ static void ati_vga_realize(PCIDevice *dev, Error **errp)
1087
}
1088
1089
/* ddc, edid */
1090
- I2CBus *i2cbus = i2c_init_bus(DEVICE(s), "ati-vga.ddc");
1090
+ i2cbus = i2c_init_bus(DEVICE(s), "ati-vga.ddc");
1091
bitbang_i2c_init(&s->bbi2c, i2cbus);
1092
- I2CSlave *i2cddc = I2C_SLAVE(qdev_new(TYPE_I2CDDC));
1093
- i2c_slave_set_address(i2cddc, 0x50);
1094
- qdev_realize_and_unref(DEVICE(i2cddc), BUS(i2cbus), &error_abort);
1092
+ i2c_slave_set_address(I2C_SLAVE(&s->i2cddc), 0x50);
1093
+ qdev_realize(DEVICE(&s->i2cddc), BUS(i2cbus), &error_abort);
1094
1095
/* mmio register space */
1096
memory_region_init_io(&s->mm, OBJECT(s), &ati_mm_ops, s,
@@ -1147,6 +1146,7 @@ static const Property ati_vga_properties[] = {
1146
DEFINE_PROP_BOOL("guest_hwcursor", ATIVGAState, cursor_guest_mode, false),
1147
/* this is a debug option, prefer PROP_UINT over PROP_BIT for simplicity */
1148
DEFINE_PROP_UINT8("x-pixman", ATIVGAState, use_pixman, DEFAULT_X_PIXMAN),
1149
+ DEFINE_EDID_PROPERTIES(ATIVGAState, i2cddc.edid_info),
1150
};
1151
1152
static void ati_vga_class_init(ObjectClass *klass, const void *data)
@@ -1169,6 +1169,9 @@ static void ati_vga_class_init(ObjectClass *klass, const void *data)
1169
1170
static void ati_vga_init(Object *o)
1171
{
1172
+ ATIVGAState *s = ATI_VGA(o);
1173
+
1174
+ object_initialize_child(o, "edid", &s->i2cddc, TYPE_I2CDDC);
1175
object_property_set_description(o, "x-pixman", "Use pixman for: "
1176
"1: fill, 2: blit");
1177
}
hw/display/ati_int.h
+2
@@ -13,6 +13,7 @@
13
#include "qemu/units.h"
14
#include "hw/pci/pci_device.h"
15
#include "hw/i2c/bitbang_i2c.h"
16
+#include "hw/display/i2c-ddc.h"
17
#include "vga_int.h"
18
#include "qom/object.h"
19
@@ -108,6 +109,7 @@ struct ATIVGAState {
109
QEMUCursor *cursor;
110
QEMUTimer vblank_timer;
111
bitbang_i2c_interface bbi2c;
112
+ I2CDDCState i2cddc;
113
MemoryRegion linear_aper;
114
MemoryRegion io;
115
MemoryRegion mm;