From: Mark Cave-Ayland Date: Wed, 20 Oct 2021 14:18:10 +0000 (+0100) Subject: q800: drop 8-bit graphic_depth check for Apple 21 inch display X-Git-Tag: v6.2.0-rc0~44^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a56c12fb760a57c1419df4a34e930160f1d8d428;p=thirdparty%2Fqemu.git q800: drop 8-bit graphic_depth check for Apple 21 inch display The graphic_depth check is no longer required since commit df8abbbadf ("macfb: add common monitor modes supported by the MacOS toolbox ROM") which introduced code in macfb_common_realize() to only allow the resolutions/depths provided in macfb_mode_table to be specified for each display type. Signed-off-by: Mark Cave-Ayland Fixes: df8abbbadf ("macfb: add common monitor modes supported by the MacOS toolbox ROM") Message-Id: <20211020141810.7875-1-mark.cave-ayland@ilande.co.uk> Signed-off-by: Laurent Vivier --- diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index a081051a8dd..e4c7c9b88ad 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -584,7 +584,7 @@ static void q800_init(MachineState *machine) qdev_prop_set_uint32(dev, "width", graphic_width); qdev_prop_set_uint32(dev, "height", graphic_height); qdev_prop_set_uint8(dev, "depth", graphic_depth); - if (graphic_width == 1152 && graphic_height == 870 && graphic_depth == 8) { + if (graphic_width == 1152 && graphic_height == 870) { qdev_prop_set_uint8(dev, "display", MACFB_DISPLAY_APPLE_21_COLOR); } else { qdev_prop_set_uint8(dev, "display", MACFB_DISPLAY_VGA);