From nobody Mon Feb 9 16:51:21 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1587550022; cv=none; d=zohomail.com; s=zohoarc; b=UxnPFi4N5QZ2vGtvtgN/3Dj8J0t6bG0Af/Y35jujqF4WC/m10bCZSiTi1BL6zMa9rrFoCGML/B2irs9IQlz+1QYRVQCb5IDsA81K53BWkXt4ZTjUwXDoi4jGoW5Ipq2pKucvBIJ0KF5XwjvhxPc/2x3ywqrCyFK2fuibZtB5K2M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587550022; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=c4+U+IFAQKG2D0+8CRwtUCE59kHFkczepZEFwLCC2K8=; b=a1WVzTRNPvKSHLoBLdBBmIvmFw44FukV+2cNMm/FkJk0Ln0qhRdIlmWt531vQosKOO8GzP+LIPl87N1oX8nZE2PLHpP5wH0zyItD/pzTL5swZB0R47Az2insZAQu32LHsHFohzvTrKK8z4SE5DAFpI50YdEqxycl2ccxvyx2z3c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1587550022550873.4416893718504; Wed, 22 Apr 2020 03:07:02 -0700 (PDT) Received: from localhost ([::1]:47144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRCHV-0007ct-Au for importer@patchew.org; Wed, 22 Apr 2020 06:07:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40908) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRCD5-0002Oh-4K for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRCD4-0004aF-MW for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:26 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:32452 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jRCD4-0004SP-5q for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:26 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-192-kp7trzsTOxy_h0srseXFww-1; Wed, 22 Apr 2020 06:02:23 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0A6258017F5; Wed, 22 Apr 2020 10:02:22 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id B166F600D2; Wed, 22 Apr 2020 10:02:21 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D83369D9B; Wed, 22 Apr 2020 12:02:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587549744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c4+U+IFAQKG2D0+8CRwtUCE59kHFkczepZEFwLCC2K8=; b=S3Awnl1/yxsG7ab/siJ8ybbWHw0aojTSrSg0fr/SpWSVzXJVnhyoK/14i/JCFifI6oJZmY DoR8OkgHdIQYwWDv6XjAsVckt811dYaN94fF+tkoyjHhkhUGoAiaPn5kZZFhKW4Kll45Sh XwHtC/XUtAtxSd/DeDxJJCRhL3UmdY8= X-MC-Unique: kp7trzsTOxy_h0srseXFww-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 2/5] Revert "hw/display/ramfb: lock guest resolution after it's set" Date: Wed, 22 Apr 2020 12:02:08 +0200 Message-Id: <20200422100211.30614-3-kraxel@redhat.com> In-Reply-To: <20200422100211.30614-1-kraxel@redhat.com> References: <20200422100211.30614-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=205.139.110.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/22 02:57:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Alex Williamson , lersek@redhat.com, hqm03ster@gmail.com, Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This reverts commit a9e0cb67b7f4c485755659f9b764c38b5f970de4. This breaks OVMF. Reproducer: Just hit 'ESC' at early boot to enter firmware setup. OVMF wants switch from (default) 800x600 to 640x480 for that, and this patch blocks it. Cc: Hou Qiming Signed-off-by: Gerd Hoffmann Reviewed-by: Laszlo Ersek Tested-by: Laszlo Ersek --- hw/display/ramfb.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c index bd4746dc1768..9d41c2ad2868 100644 --- a/hw/display/ramfb.c +++ b/hw/display/ramfb.c @@ -31,7 +31,6 @@ struct RAMFBState { DisplaySurface *ds; uint32_t width, height; struct RAMFBCfg cfg; - bool locked; }; =20 static void ramfb_unmap_display_surface(pixman_image_t *image, void *unuse= d) @@ -72,25 +71,18 @@ static DisplaySurface *ramfb_create_display_surface(int= width, int height, static void ramfb_fw_cfg_write(void *dev, off_t offset, size_t len) { RAMFBState *s =3D dev; - uint32_t fourcc, format, width, height; + uint32_t fourcc, format; hwaddr stride, addr; =20 - width =3D be32_to_cpu(s->cfg.width); - height =3D be32_to_cpu(s->cfg.height); + s->width =3D be32_to_cpu(s->cfg.width); + s->height =3D be32_to_cpu(s->cfg.height); stride =3D be32_to_cpu(s->cfg.stride); fourcc =3D be32_to_cpu(s->cfg.fourcc); addr =3D be64_to_cpu(s->cfg.addr); format =3D qemu_drm_format_to_pixman(fourcc); =20 fprintf(stderr, "%s: %dx%d @ 0x%" PRIx64 "\n", __func__, - width, height, addr); - if (s->locked) { - fprintf(stderr, "%s: resolution locked, change rejected\n", __func= __); - return; - } - s->locked =3D true; - s->width =3D width; - s->height =3D height; + s->width, s->height, addr); s->ds =3D ramfb_create_display_surface(s->width, s->height, format, stride, addr); } @@ -110,13 +102,6 @@ void ramfb_display_update(QemuConsole *con, RAMFBState= *s) dpy_gfx_update_full(con); } =20 -static void ramfb_reset(void *opaque) -{ - RAMFBState *s =3D (RAMFBState *)opaque; - s->locked =3D false; - memset(&s->cfg, 0, sizeof(s->cfg)); -} - RAMFBState *ramfb_setup(Error **errp) { FWCfgState *fw_cfg =3D fw_cfg_find(); @@ -129,12 +114,9 @@ RAMFBState *ramfb_setup(Error **errp) =20 s =3D g_new0(RAMFBState, 1); =20 - s->locked =3D false; - rom_add_vga("vgabios-ramfb.bin"); fw_cfg_add_file_callback(fw_cfg, "etc/ramfb", NULL, ramfb_fw_cfg_write, s, &s->cfg, sizeof(s->cfg), false); - qemu_register_reset(ramfb_reset, s); return s; } --=20 2.18.2