From nobody Wed May 8 13:02:47 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 78.46.105.101 is neither permitted nor denied by domain of seabios.org) client-ip=78.46.105.101; envelope-from=seabios-bounces@seabios.org; helo=coreboot.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 78.46.105.101 is neither permitted nor denied by domain of seabios.org) smtp.mailfrom=seabios-bounces@seabios.org ARC-Seal: i=1; a=rsa-sha256; t=1594680897; cv=none; d=zohomail.com; s=zohoarc; b=fqQgOhcv8lafJXIocpaYlH7RRf+uEaCTccoMdtszo2oYQcfPSiVlnqBgrFDSwdK0ejmDAngtV/Lcrfr6CwVw8K22w6CTqAjybQxME3LxZJZ1mjS1/PV4jG4NcoiCOHp8olJipH9AOnO+PGv7geiSfoWJ4BtE+RG1IuPqONarGys= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594680897; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Subject:To; bh=KUM54IOZ4Pq/3BAUH86/8eN1lAWbiZ/lNDxaINy2Ywc=; b=GBFKt+Dz97bodakB70a2QLZd7SlyCA4WAhyW8lcKCWehbKxQX/W4J3lh/Hg5l5HogVqsoFEiN6i65sr/p5TjM8EarL+R5YMOPEAz9pLUOGIgILi7kcxvoR70xY7A/hk0c6KIoNDwz94R9hKn9oa1F82HEtjZ50mp6oU2DwpoAR8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 78.46.105.101 is neither permitted nor denied by domain of seabios.org) smtp.mailfrom=seabios-bounces@seabios.org Return-Path: Received: from coreboot.org (coreboot.org [78.46.105.101]) by mx.zohomail.com with SMTPS id 1594680897719730.357790746309; Mon, 13 Jul 2020 15:54:57 -0700 (PDT) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTPA id 4096D10C1947; Mon, 13 Jul 2020 22:54:54 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTP id 41B6810C1941 for ; Mon, 13 Jul 2020 22:54:36 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) for ; Mon, 13 Jul 2020 15:54:35 -0700 (PDT) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by smtp.gmail.com with ESMTPSA id 2sm20096584qka.42.2020.07.13.15.54.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 15:54:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=koconnor.net; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=R0jV0sczT2QcaBSihwN0nLqWWsgstAKMReB0+knddW0=; b=YmczkJT14XUf08aB/mcJZ7AE2wbuTQCoYE0M/aBV6kpO5XnmgId20Qjv+c6Bdi6iQU GKWsHVgkabTnO3QMq0meEggIFVu8OgWG6cOchlC8VCk93PLQpGI5Y5HmJ+6e2YGrPW/a NINvStjgnqOVqjIbi5uHQc65MyxZz/LaTzoN8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=R0jV0sczT2QcaBSihwN0nLqWWsgstAKMReB0+knddW0=; b=n/cYPANtgrHcKvjCqU0kqSQMtc8X1bnT3ZuecKmweLZFRDkjLwKSalrAIOGYNobvW/ 71glhhQkdQkhXa7rvOYGwi+fDcB1n7/eTRc3r/vkFvKuVTcROW0/E0bxRyBefSUJ1cgV lZMbM8IuBbN3n8xxzmXxzSRHBP1VpGTEpdYBrEyCs2YehybJl2WmeROm45rHtPcqLTAZ U1aQ0NPTt4iHK0AdIQTDH4weht1LJW8tuDBCmLkBK69DuAra8ig9WKSIjOvODemnWO3G reLkiOpdfpVTer8v9eqrxU4OOgMvW5IM5A+o0GVEi4Z2HCfmG+Idk6sII/2q5703gznG CzuQ== X-Gm-Message-State: AOAM531oPrL/QWG30zoMPGKjnCvQFJeUCZ2xwiGuPitJn48F1ViLBkhd WBKuFVNpmT4ra7mWh4G40Idcoeite4k= X-Google-Smtp-Source: ABdhPJzfYvAzcqPPFE0RsjVEXlg87mn6UnHOq0sjgF5xkJzePYVaiZ11NdWbELEbFg5iOGD/ZxLQ8A== X-Received: by 2002:ae9:dc81:: with SMTP id q123mr1686313qkf.99.1594680874405; Mon, 13 Jul 2020 15:54:34 -0700 (PDT) From: Kevin O'Connor To: seabios@seabios.org Date: Mon, 13 Jul 2020 18:54:25 -0400 Message-Id: <20200713225425.2202645-1-kevin@koconnor.net> MIME-Version: 1.0 X-Spam-Level: *** Message-ID-Hash: LD3MM6L3K3I3SZA6KHTNAAULMJ7U3AD4 X-Message-ID-Hash: LD3MM6L3K3I3SZA6KHTNAAULMJ7U3AD4 X-MailFrom: kevin@koconnor.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-seabios.seabios.org-0; header-match-seabios.seabios.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: felix X-Mailman-Version: 3.3.1 Precedence: list Subject: [SeaBIOS] [PATCH] vgabios: Fix preserve memory flag in handle_1000 List-Id: SeaBIOS mailing list Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable Authentication-Results: coreboot.org; auth=pass smtp.auth=mailman@coreboot.org smtp.mailfrom=seabios-bounces@seabios.org X-Spamd-Bar: - X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit 5108c69c made a change to the ordering of some code which broke the check for the MF_NOCLEARMEM flag. Reported by felix.von.s@posteo.de Signed-off-by: Kevin O'Connor --- vgasrc/vgabios.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c index 3b9694c..198ee55 100644 --- a/vgasrc/vgabios.c +++ b/vgasrc/vgabios.c @@ -336,6 +336,9 @@ static void handle_1000(struct bregs *regs) { int mode =3D regs->al & 0x7f; + int flags =3D MF_LEGACY | (GET_BDA(modeset_ctl) & (MF_NOPALETTE|MF_GRA= YSUM)); + if (regs->al & 0x80) + flags |=3D MF_NOCLEARMEM; =20 // Set regs->al if (mode > 7) @@ -345,10 +348,6 @@ handle_1000(struct bregs *regs) else regs->al =3D 0x30; =20 - int flags =3D MF_LEGACY | (GET_BDA(modeset_ctl) & (MF_NOPALETTE|MF_GRA= YSUM)); - if (regs->al & 0x80) - flags |=3D MF_NOCLEARMEM; - vga_set_mode(mode, flags); } =20 --=20 2.26.2 _______________________________________________ SeaBIOS mailing list -- seabios@seabios.org To unsubscribe send an email to seabios-leave@seabios.org