From nobody Sun Apr 12 02:49:34 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1771802609; cv=none; d=zohomail.com; s=zohoarc; b=TG4rn9jMTjQsuQmtGWCOShhLD7ltj9/B+dO3riRV1TWgd4UDl7LfzvMOokaIxYa1qeRaZyTYYn2K+AhhK42x/kXsn7r7MNA/N0RUVCy4sz/+h0VDqYAHUUVVFFkeq8gygbG2mcOm17zYKeDmu2fnzAZ/aROly5QjKkas2Lhqy0M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771802609; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=OlNDJrN9SOFLJmcRVoNcVGELItOSKOjjd7ufK3aM0dc=; b=ZR2/6WitPWcQS7iBxxj852AnssWSrKqO2yfbNs6jF8MPjWn4KO6Sj2jkUxw60sjI6ADEb2sMQCuO7BMCuG6EBmCWkrvq8jQbUWtv9EN9YTZm8P4u0ltiYxvpm6gueGpQA91x7on6phCpR+WuozBJPD2EwM+5UuXYw/tnrjupY30= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771802609389825.781858153267; Sun, 22 Feb 2026 15:23:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vuImf-0003bc-Vt; Sun, 22 Feb 2026 18:22:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vuIme-0003bA-CZ for qemu-devel@nongnu.org; Sun, 22 Feb 2026 18:22:40 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vuImc-000142-RX for qemu-devel@nongnu.org; Sun, 22 Feb 2026 18:22:40 -0500 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-436317c80f7so3132159f8f.1 for ; Sun, 22 Feb 2026 15:22:38 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43970d54760sm15072903f8f.35.2026.02.22.15.22.36 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 22 Feb 2026 15:22:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771802557; x=1772407357; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=OlNDJrN9SOFLJmcRVoNcVGELItOSKOjjd7ufK3aM0dc=; b=xBDTV7z5eALxxdmuANAHCJiBrFo4ej9Y+0g3iW8IhuYC74s3mIAu08M33HuNFW9UVT y05uKXF7X2AFjFOew84VacXfsJFN+IU/YoZUfLlWP3xRiJQ2NC2dyTeMTlonNkaWPF8c ybK07hcnNUY1VlIrR5ddH2aFcbh0OSCr/0T9tB2Y6P6s9NkDrfbCFbhmMm03RWjKuV61 Ps1ygPDskMYB7vMBekPL569ZfchEiVXbGso3UUubmvWOdgrMKkseDuCBHVlW6UrNjEk1 c1EPz9601Cl3nzgJtm3hPtaDXMI/+nxVsdAxXuHnSTkYMn9s8J5zANNzgLqHzXWWSCL5 sS6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771802557; x=1772407357; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=OlNDJrN9SOFLJmcRVoNcVGELItOSKOjjd7ufK3aM0dc=; b=mdaZUn8nF3QZoxDE89EIsgbccSxCY1r7FRzGMOxpEhPgFmo9mrxkkmyoL76boppXIy qL1oVNDdF66ZuO6ZLn6/dFX+zmH+w752KPoXO22ueX7+TXWfAYEFzT8+FkxJG5/RBJhL c/xPtmdKMorYAxVnysTFS/5o6tvSJbGUWyvXofP9fyCxwoJwJlaZoMSw2vBcd9sKkN1I WCVjJyYjTo2KHh02izA8jxYbbN9nVq54teEuiMltEtqiRn0JEkdXh2Hh2iXxS4wRnfNZ skPLPBghYvwLTSabAKbrfkzk8cK6TpJTgZcey982He6otq/nJu8ZJM1h4Ky65TtqEC33 94Qg== X-Gm-Message-State: AOJu0YyFvFjvpHSwAdO48Cc7csO/WA6QsoxodosuX8rYtCPs7BlJ3Duk xiHKON4Labww3VtDYclHB35WC7afEJT8Qyi0tD424c+pq0EZxj5aNPntUzK3GwHcSq0hSEUXxG3 Ro7eRPPs= X-Gm-Gg: AZuq6aI0HQEyEHt0ElRpRHX/QQXy+QlerAWYMqDO5AerqAI/swr5RG0QcXC9JhFspn8 dbLWPAcIwPUZBE66ICmuWTZXSucwgCznd11ZBLzkPYy/XlXIOwcVlXIjeNKHRHz+rwQ+8eRBmjj DmXj4qXjAOe/Dm2ks4dUYLVdq69lkZ2uhZvm0Cs6UyE3KdznZ+DpWsG554uLUxqMoucokqTyDCS N0GNkmH4uePY3BplvKLe+ucgiwpuHzj55Jl2oGXgauVdND+nw23i83Y+XsVe01O8ygzE5me7mm4 IAJt2nBYKECmqv6g38pCecR3Q+eoJJRjn0v5O6ZxNmESla9kHO6gvEmeUkngk5uMpq/BrwsEo3U 8KQtzIVfx0YGeL2kZKXrXK/n28reMEXc7+SG16zGzOynR25j7/YzZUPvRWyjTZ3x+XnJWaaRikL 2OBDXd3nCzAyrKWpRMW2N16dnAvOB/PfHCcqUX09jWZpZy9IppuyM8lhLkgqYpqjM215gTHMvSu 7SZZ5+59cQ= X-Received: by 2002:a05:6000:4383:b0:436:180e:78d9 with SMTP id ffacd0b85a97d-4396fd9b890mr12165129f8f.1.1771802557029; Sun, 22 Feb 2026 15:22:37 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL v2 08/21] hw/m68k/q800: Set MACFB_DISPLAY_APPLE_21_COLOR within MacFrameBuffer Date: Mon, 23 Feb 2026 00:22:18 +0100 Message-ID: <20260222232222.7183-3-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260222232222.7183-1-philmd@linaro.org> References: <20260222232222.7183-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771802611915154100 The MACFB_DISPLAY_APPLE_21_COLOR mode is not specific to the Q800 machine. Check and set it once in the MacFB DeviceRealize handler. No need to explicitly set the MACFB_DISPLAY_VGA mode since this is the default value. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Mark Cave-Ayland Message-Id: <20260216213121.47122-5-philmd@linaro.org> --- hw/display/macfb.c | 4 ++++ hw/m68k/q800.c | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/display/macfb.c b/hw/display/macfb.c index 8ef174dc6df..b8115c2be13 100644 --- a/hw/display/macfb.c +++ b/hw/display/macfb.c @@ -645,6 +645,10 @@ static bool macfb_common_realize(DeviceState *dev, Mac= fbState *s, Error **errp) { DisplaySurface *surface; =20 + if (s->width =3D=3D 1152 && s->height =3D=3D 870) { + s->type =3D MACFB_DISPLAY_APPLE_21_COLOR; + } + s->mode =3D macfb_find_mode(s->type, s->width, s->height, s->depth); if (!s->mode) { gchar *list; diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index b55c03a90bf..ba32da2fa45 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -563,11 +563,6 @@ static void q800_machine_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 =3D=3D 1152 && graphic_height =3D=3D 870) { - qdev_prop_set_uint8(dev, "display", MACFB_DISPLAY_APPLE_21_COLOR); - } else { - qdev_prop_set_uint8(dev, "display", MACFB_DISPLAY_VGA); - } qdev_realize(dev, BUS(nubus), &error_fatal); =20 macfb_mode =3D (NUBUS_MACFB(dev)->macfb).mode; --=20 2.52.0