[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/84] display/xlnx_dp: Fix to realize "i2c-ddc" and "aux-to-i2c-b
From: |
Markus Armbruster |
Subject: |
[PULL 04/84] display/xlnx_dp: Fix to realize "i2c-ddc" and "aux-to-i2c-bridge" |
Date: |
Mon, 15 Jun 2020 22:38:48 +0200 |
xlnx_dp_init() creates these two devices, but they're never realized.
Affects machine xlnx-zcu102.
In theory, a device becomes real only on realize. In practice, the
transition from unreal to real is a fuzzy one. The work to make a
device real can be spread between realize methods (fine),
instance_init methods (wrong), and board code wiring up the device
(fine as long as it effectively happens on realize). Depending on
what exactly is done where, a device can work even when we neglect to
realize it.
These two appear to work. Nevertheless, it's a clear misuse of the
interface. Even when it works today (more or less by chance), it can
break tomorrow.
Fix by realizing them in xlnx_dp_realize().
Fixes: 58ac482a66de09a7590f705e53fc6a3fb8a055e8
Cc: KONRAD Frederic <fred.konrad@greensocs.com>
Cc: Alistair Francis <alistair@alistair23.me>
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20200609122339.937862-3-armbru@redhat.com>
---
hw/display/xlnx_dp.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c
index 8d940cd8d1..5210412e55 100644
--- a/hw/display/xlnx_dp.c
+++ b/hw/display/xlnx_dp.c
@@ -1266,9 +1266,13 @@ static void xlnx_dp_realize(DeviceState *dev, Error
**errp)
DisplaySurface *surface;
struct audsettings as;
+ qdev_init_nofail(DEVICE(s->aux_bus->bridge));
+
qdev_init_nofail(DEVICE(s->dpcd));
aux_map_slave(AUX_SLAVE(s->dpcd), 0x0000);
+ qdev_init_nofail(DEVICE(s->edid));
+
s->console = graphic_console_init(dev, 0, &xlnx_dp_gfx_ops, s);
surface = qemu_console_surface(s->console);
xlnx_dpdma_set_host_data_location(s->dpdma, DP_GRAPHIC_DMA_CHANNEL,
--
2.26.2
- [PULL 00/84] QOM patches for 2020-06-15, Markus Armbruster, 2020/06/15
- [PULL 02/84] qom: Make "info qom-tree" show children sorted, Markus Armbruster, 2020/06/15
- [PULL 06/84] arm/aspeed: Compute the number of CPUs from the SoC definition, Markus Armbruster, 2020/06/15
- [PULL 04/84] display/xlnx_dp: Fix to realize "i2c-ddc" and "aux-to-i2c-bridge",
Markus Armbruster <=
- [PULL 07/84] arm/aspeed: Rework NIC attachment, Markus Armbruster, 2020/06/15
- [PULL 05/84] sd/pxa2xx_mmci: Fix to realize "pxa2xx-mmci" device, Markus Armbruster, 2020/06/15
- [PULL 16/84] macio: Put "macio-nvram" device on the macio bus, Markus Armbruster, 2020/06/15
- [PULL 10/84] mac_via: Fix to realize "mos6522-q800-via*" devices, Markus Armbruster, 2020/06/15
- [PULL 09/84] auxbus: Fix aux-to-i2c-bridge to be a subtype of aux-slave, Markus Armbruster, 2020/06/15
- [PULL 24/84] qdev: Assert devices are plugged into a bus that can take them, Markus Armbruster, 2020/06/15
- [PULL 22/84] riscv: Fix type of SiFive[EU]SocState, member parent_obj, Markus Armbruster, 2020/06/15
- [PULL 19/84] pnv/psi: Correct the pnv-psi* devices not to be sysbus devices, Markus Armbruster, 2020/06/15