[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 05/10] macfb: set initial value of mode control registers in m
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 05/10] macfb: set initial value of mode control registers in macfb_common_realize() |
Date: |
Wed, 2 Mar 2022 21:27:47 +0000 |
If booting Linux directly in the q800 machine using -kernel rather than using a
MacOS toolbox ROM, the mode control registers are never initialised,
causing macfb_mode_write() to fail to determine the current resolution after
migration. Resolve this by always setting the initial values of the mode control
registers based upon the initial macfb properties during realize.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/display/macfb.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/hw/display/macfb.c b/hw/display/macfb.c
index 7371986480..2f8e016566 100644
--- a/hw/display/macfb.c
+++ b/hw/display/macfb.c
@@ -655,6 +655,14 @@ static bool macfb_common_realize(DeviceState *dev,
MacfbState *s, Error **errp)
return false;
}
+ /*
+ * Set mode control registers to match the mode found above so that
+ * macfb_mode_write() does the right thing if no MacOS toolbox ROM
+ * is present to initialise them
+ */
+ s->regs[DAFB_MODE_CTRL1 >> 2] = s->mode->mode_ctrl1;
+ s->regs[DAFB_MODE_CTRL2 >> 2] = s->mode->mode_ctrl2;
+
s->con = graphic_console_init(dev, 0, &macfb_ops, s);
surface = qemu_console_surface(s->con);
--
2.20.1
- [PATCH v2 03/10] macfb: increase number of registers saved in MacfbState, (continued)
- [PATCH v2 04/10] macfb: add VMStateDescription fields for display type and VBL timer, Mark Cave-Ayland, 2022/03/02
- [PATCH v2 05/10] macfb: set initial value of mode control registers in macfb_common_realize(),
Mark Cave-Ayland <=
- [PATCH v2 06/10] esp: introduce esp_set_pdma_cb() function, Mark Cave-Ayland, 2022/03/02
- [PATCH v2 07/10] esp: introduce esp_pdma_cb() function, Mark Cave-Ayland, 2022/03/02
- [PATCH v2 08/10] esp: convert ESPState pdma_cb from a function pointer to an integer, Mark Cave-Ayland, 2022/03/02
- [PATCH v2 09/10] esp: include the current PDMA callback in the migration stream, Mark Cave-Ayland, 2022/03/02