| Message ID | 20211002110007.30825-13-mark.cave-ayland@ilande.co.uk |
|---|---|
| State | New |
| Headers | show |
| Series | macfb: fixes for booting MacOS | expand |
On 10/2/21 13:00, Mark Cave-Ayland wrote: > Whilst the in-built Quadra 800 framebuffer exists within the Nubus address > space for slot 9, it has its own dedicated interrupt on VIA2. Force the > macfb device to occupy slot 9 in the q800 machine and wire its IRQ to the > separate video interrupt since this is what is expected by the MacOS > interrupt handler. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > --- > hw/m68k/q800.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Le 02/10/2021 à 13:00, Mark Cave-Ayland a écrit : > Whilst the in-built Quadra 800 framebuffer exists within the Nubus address > space for slot 9, it has its own dedicated interrupt on VIA2. Force the > macfb device to occupy slot 9 in the q800 machine and wire its IRQ to the > separate video interrupt since this is what is expected by the MacOS > interrupt handler. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > --- > hw/m68k/q800.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c > index df3fd3711e..fd4855047e 100644 > --- a/hw/m68k/q800.c > +++ b/hw/m68k/q800.c > @@ -407,8 +407,10 @@ static void q800_init(MachineState *machine) > MAC_NUBUS_FIRST_SLOT * NUBUS_SUPER_SLOT_SIZE); > sysbus_mmio_map(SYS_BUS_DEVICE(dev), 1, NUBUS_SLOT_BASE + > MAC_NUBUS_FIRST_SLOT * NUBUS_SLOT_SIZE); > - > - for (i = 0; i < VIA2_NUBUS_IRQ_NB; i++) { > + qdev_connect_gpio_out(dev, 9, > + qdev_get_gpio_in_named(via2_dev, "nubus-irq", > + VIA2_NUBUS_IRQ_INTVIDEO)); > + for (i = 1; i < VIA2_NUBUS_IRQ_NB; i++) { > qdev_connect_gpio_out(dev, 9 + i, > qdev_get_gpio_in_named(via2_dev, "nubus-irq", > VIA2_NUBUS_IRQ_9 + i)); > @@ -419,6 +421,7 @@ static void q800_init(MachineState *machine) > /* framebuffer in nubus slot #9 */ > > dev = qdev_new(TYPE_NUBUS_MACFB); > + qdev_prop_set_uint32(dev, "slot", 9); > qdev_prop_set_uint32(dev, "width", graphic_width); > qdev_prop_set_uint32(dev, "height", graphic_height); > qdev_prop_set_uint8(dev, "depth", graphic_depth); > Reviewed-by: Laurent Vivier <laurent@vivier.eu>
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index df3fd3711e..fd4855047e 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -407,8 +407,10 @@ static void q800_init(MachineState *machine) MAC_NUBUS_FIRST_SLOT * NUBUS_SUPER_SLOT_SIZE); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 1, NUBUS_SLOT_BASE + MAC_NUBUS_FIRST_SLOT * NUBUS_SLOT_SIZE); - - for (i = 0; i < VIA2_NUBUS_IRQ_NB; i++) { + qdev_connect_gpio_out(dev, 9, + qdev_get_gpio_in_named(via2_dev, "nubus-irq", + VIA2_NUBUS_IRQ_INTVIDEO)); + for (i = 1; i < VIA2_NUBUS_IRQ_NB; i++) { qdev_connect_gpio_out(dev, 9 + i, qdev_get_gpio_in_named(via2_dev, "nubus-irq", VIA2_NUBUS_IRQ_9 + i)); @@ -419,6 +421,7 @@ static void q800_init(MachineState *machine) /* framebuffer in nubus slot #9 */ dev = qdev_new(TYPE_NUBUS_MACFB); + qdev_prop_set_uint32(dev, "slot", 9); qdev_prop_set_uint32(dev, "width", graphic_width); qdev_prop_set_uint32(dev, "height", graphic_height); qdev_prop_set_uint8(dev, "depth", graphic_depth);
Whilst the in-built Quadra 800 framebuffer exists within the Nubus address space for slot 9, it has its own dedicated interrupt on VIA2. Force the macfb device to occupy slot 9 in the q800 machine and wire its IRQ to the separate video interrupt since this is what is expected by the MacOS interrupt handler. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> --- hw/m68k/q800.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)