[PATCH] q800: drop 8-bit graphic_depth check for Apple 21 inch display

Mark Cave-Ayland posted 1 patch 2 years, 6 months ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20211020141810.7875-1-mark.cave-ayland@ilande.co.uk
Maintainers: Laurent Vivier <laurent@vivier.eu>
hw/m68k/q800.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] q800: drop 8-bit graphic_depth check for Apple 21 inch display
Posted by Mark Cave-Ayland 2 years, 6 months ago
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 <mark.cave-ayland@ilande.co.uk>
Fixes: df8abbbadf ("macfb: add common monitor modes supported by the MacOS toolbox ROM")
---
 hw/m68k/q800.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index fd4855047e..da2736c82c 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -425,7 +425,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);
-- 
2.20.1


Re: [PATCH] q800: drop 8-bit graphic_depth check for Apple 21 inch display
Posted by Laurent Vivier 2 years, 6 months ago
Le 20/10/2021 à 16:18, Mark Cave-Ayland a écrit :
> 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 <mark.cave-ayland@ilande.co.uk>
> Fixes: df8abbbadf ("macfb: add common monitor modes supported by the MacOS toolbox ROM")
> ---
>   hw/m68k/q800.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
> index fd4855047e..da2736c82c 100644
> --- a/hw/m68k/q800.c
> +++ b/hw/m68k/q800.c
> @@ -425,7 +425,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);
> 

Reviewed-by: Laurent Vivier <laurent@vivier.eu>