From nobody Sun Apr 12 07:20:12 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=1771277592; cv=none; d=zohomail.com; s=zohoarc; b=DFoG2cOh/Qox6hd5aQgyibhhMBZO41ABezCK8p/e1slZZ1081Nvr3XXjNxTSYQ28DCDhIS2qUHsVNwWUBrEvyyoGMB6khjs4x/wDDPrYRelGYefxUlhOepSrdF83M5d3NGbYYQj5y8TWrTSIznWdNqXd0h1//eYcOam5XCalGck= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771277592; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=4iTYDTjW8oF01EE5U+uJHraTm442v4OtMz2SMPZaJV0=; b=ZGEEM52vRJ3wqZ4bB0Numtcu6okaB+Oes/BY4S1WZDe9AoJfaooydgMnAUkkR37YZtqpo0P3fSF6ibNilI8ceKKcJepRopqz4cC2pChaD8Z4LK3SS40VgeQ11fqUpfcAYAh35cuR4I8VOr62syAOl71UAx9ZY6UxReId9zdN7ls= 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 1771277592476128.17529929822786; Mon, 16 Feb 2026 13:33:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vs6Cr-00023D-Gc; Mon, 16 Feb 2026 16:32:37 -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 1vs6CE-0000bh-42 for qemu-devel@nongnu.org; Mon, 16 Feb 2026 16:32:01 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vs6CB-00041p-Bc for qemu-devel@nongnu.org; Mon, 16 Feb 2026 16:31:57 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-483770e0b25so30818145e9.0 for ; Mon, 16 Feb 2026 13:31:54 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48371a3f835sm91270965e9.25.2026.02.16.13.31.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 16 Feb 2026 13:31:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771277513; x=1771882313; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4iTYDTjW8oF01EE5U+uJHraTm442v4OtMz2SMPZaJV0=; b=NuDFnYm+eVmGOrK4dlTMIP/d3LjUJh8VxOhnhokSVX07Yb/QacVmkEzW3dl0g5KxBn irtFKnMbtXUzkXErA17RQsjRDLsVGZVvjt/WSbHTwAh42OKGgFMRoiEiiN1kecXlvXGY BEmbHmffCzB62t9BFOLp/Y4mEpe+0fBIf8Dm65VU1zS1YVFmzaqjI+LF1iv8jG05tWuI /lCQxsgawTfo7ilGOFI8fvsq8rktMUnH5latOEsX8Zynckvv7BT1Mukeghu+pdEpmexq C2GYHuoSCRBLGkh6XRQOLkyKJ4Gz6PT+GhmZqU8ClEMmBvcWZiGC2RowwTVyJY05XZUj jbJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771277513; x=1771882313; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=4iTYDTjW8oF01EE5U+uJHraTm442v4OtMz2SMPZaJV0=; b=clNSKiJ2vr1YlzpDwtNcip91P4u9mj21ebm7vidWEawpPbim/tdTKNxLT35gdBUN7B uw60tImHkJLD2KjTf0nbmwZwxXdD0EIwxAUMh2Gt8aio/uPR2cI3xNFg9KIbEwTbPkI/ +eELN8AcuyA7wFnGRe7wE3Qjkt43muYxGEkTugBHhv6sZ45ilbNAwqYvMw7ibr0tpBFW kjGn9JblmDI5D6EoDNbIfM3Jib6lxNlVTwEjo7yLqLuS+0I2Tfd9AINKSIQXtw+9cDYH QxLWTFPu0EvFWdcbR8HwshZP+rds9s0iAGh3sXmTuqfMSZsw7LJpdN6JZzcLLWFWMc9d 1PPg== X-Gm-Message-State: AOJu0YxVYjprGmV2ftswLzfrs2zl6Z+ZNItlRZEx1JTbjcTuyjTGOZVZ rL682xnbGFTSvsxR45DwiffcmWI+/xci5ECaqxgS8hrr3vTzKwWZ7ldlRWm+KUbBQniQXe8l1Ru k56ZdMXI= X-Gm-Gg: AZuq6aIr45CTqfqWc+OZrsg7XwwONSWAYTxwUFMLirEDeXKR6mHEhDjKQ4Fwbq7aIQ+ xCfi/rvpq+43crpoxYuLVB/4TG1X8DwtD54xyMxMS/DWwkDcDcojB2Hb6ea6825cdLy8v/yQZCR tRCqgovH/khQDjY/eBYHAodnrNQjQyW4KVtH6zN8Q93IBy3GPC0oElTPqe0OZt5o3ZsE8dHr60R pbwovfJUVEzUFfo5xWXp41dpwlO4/ITZYuXFPg0gr5KU/syVz4I/VxkcBzqUAeDuu6OJAqdRqtY Lsmu8SmHF0dCwQM1nQGOyr/puplt31HvxXLocnEMWIB9Gm/0/OORJClT4iL4f9NWoGAAHkab+xL 8ZXR2TmfVBcLxdF0C2VBuvTa4VohlWCX9XPm/v0WlBth+obhgivHsd3KAK0IBBQX60EA7HH/S7c NgYXVqrK2GRi92CcNEyGzznaVFvU3/VFu6IcH+wDOdBBRokwi7QTq9HQZIRZfnqoCJPtpNWI2o X-Received: by 2002:a05:600c:620d:b0:480:3bba:1cac with SMTP id 5b1f17b1804b1-48371043046mr182491715e9.6.1771277513333; Mon, 16 Feb 2026 13:31:53 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Paolo Bonzini , Chinmay Rath , Artyom Tarasenko , Pierrick Bouvier , Laurent Vivier , qemu-ppc@nongnu.org, Harsh Prateek Bora , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 4/8] hw/m68k/q800: Set MACFB_DISPLAY_APPLE_21_COLOR within MacFrameBuffer Date: Mon, 16 Feb 2026 22:31:17 +0100 Message-ID: <20260216213121.47122-5-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260216213121.47122-1-philmd@linaro.org> References: <20260216213121.47122-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::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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=unavailable 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: 1771277594455158500 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 --- 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