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>
---
Based-on: 20260303024730.1489136-1-chad@jablonski.xyz
hw/display/ati.c | 13 ++++++++-----
hw/display/ati_int.h | 2 ++
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/hw/display/ati.c b/hw/display/ati.c
index c93ef64525..bb9e0bba28 100644
--- a/hw/display/ati.c
+++ b/hw/display/ati.c
@@ -28,7 +28,6 @@
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "ui/console.h"
-#include "hw/display/i2c-ddc.h"
#include "trace.h"
#define ATI_DEBUG_HW_CURSOR 0
@@ -1058,6 +1057,7 @@ static void ati_vga_realize(PCIDevice *dev, Error **errp)
{
ATIVGAState *s = ATI_VGA(dev);
VGACommonState *vga = &s->vga;
+ I2CBus *i2cbus;
uint64_t aper_size;
#ifndef CONFIG_PIXMAN
@@ -1106,11 +1106,10 @@ static void ati_vga_realize(PCIDevice *dev, Error **errp)
}
/* ddc, edid */
- I2CBus *i2cbus = i2c_init_bus(DEVICE(s), "ati-vga.ddc");
+ i2cbus = i2c_init_bus(DEVICE(s), "ati-vga.ddc");
bitbang_i2c_init(&s->bbi2c, i2cbus);
- I2CSlave *i2cddc = I2C_SLAVE(qdev_new(TYPE_I2CDDC));
- i2c_slave_set_address(i2cddc, 0x50);
- qdev_realize_and_unref(DEVICE(i2cddc), BUS(i2cbus), &error_abort);
+ i2c_slave_set_address(I2C_SLAVE(&s->i2cddc), 0x50);
+ qdev_realize(DEVICE(&s->i2cddc), BUS(i2cbus), &error_abort);
/* mmio register space */
memory_region_init_io(&s->mm, OBJECT(s), &ati_mm_ops, s,
@@ -1171,6 +1170,7 @@ static const Property ati_vga_properties[] = {
DEFINE_PROP_BOOL("guest_hwcursor", ATIVGAState, cursor_guest_mode, false),
/* this is a debug option, prefer PROP_UINT over PROP_BIT for simplicity */
DEFINE_PROP_UINT8("x-pixman", ATIVGAState, use_pixman, DEFAULT_X_PIXMAN),
+ DEFINE_EDID_PROPERTIES(ATIVGAState, i2cddc.edid_info),
};
static void ati_vga_class_init(ObjectClass *klass, const void *data)
@@ -1193,6 +1193,9 @@ static void ati_vga_class_init(ObjectClass *klass, const void *data)
static void ati_vga_init(Object *o)
{
+ ATIVGAState *s = ATI_VGA(o);
+
+ object_initialize_child(o, "edid", &s->i2cddc, TYPE_I2CDDC);
object_property_set_description(o, "x-pixman", "Use pixman for: "
"1: fill, 2: blit");
}
diff --git a/hw/display/ati_int.h b/hw/display/ati_int.h
index 28f4e9d977..21b74511e0 100644
--- a/hw/display/ati_int.h
+++ b/hw/display/ati_int.h
@@ -13,6 +13,7 @@
#include "qemu/units.h"
#include "hw/pci/pci_device.h"
#include "hw/i2c/bitbang_i2c.h"
+#include "hw/display/i2c-ddc.h"
#include "vga_int.h"
#include "qom/object.h"
@@ -117,6 +118,7 @@ struct ATIVGAState {
QEMUCursor *cursor;
QEMUTimer vblank_timer;
bitbang_i2c_interface bbi2c;
+ I2CDDCState i2cddc;
MemoryRegion linear_aper;
MemoryRegion io;
MemoryRegion mm;
--
2.41.3