From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.120]) by mx.groups.io with SMTP id smtpd.web11.235.1582611994341147284 for ; Mon, 24 Feb 2020 22:26:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=gsp5ZZPk; spf=pass (domain: redhat.com, ip: 207.211.31.120, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582611993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WNWcENFFgc/+K0PscQU3GYI6I9KzGopQUOHyNI9IgYA=; b=gsp5ZZPkH1WtLKuyfYSE4Gm5OrlXzEoOUZDdT28UzqfuY1mUcDgiJiQIf6pUFIv9Mbb3vG Fqivl8aiNy77yIL1wHQiCG1LTZyDScHtN5diGnkcdLsBioehfjEjTDSKD7M17osbA5iojl 2Own7SQ9i6VdkFVUy8UHAAZbWhOAzqI= 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-165-A3wkHBKzP5KgW-cnpbfq2A-1; Tue, 25 Feb 2020 01:26:27 -0500 X-MC-Unique: A3wkHBKzP5KgW-cnpbfq2A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ED1F418AB2C3; Tue, 25 Feb 2020 06:26:25 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-87.ams2.redhat.com [10.36.116.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id A03A360BF7; Tue, 25 Feb 2020 06:26:25 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 9D37C1747F; Tue, 25 Feb 2020 07:26:24 +0100 (CET) Date: Tue, 25 Feb 2020 07:26:24 +0100 From: Gerd Hoffmann To: Laszlo Ersek Cc: edk2-devel-groups-io , Ard Biesheuvel , Jordan Justen , Marc W Chen , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Subject: Re: [PATCH edk2-stable202002] OvmfPkg/QemuVideoDxe: unbreak "secondary-vga" and "bochs-display" support Message-ID: <20200225062624.ox64z5ivxgra7yfv@sirius.home.kraxel.org> References: <20200224171741.7494-1-lersek@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200224171741.7494-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Mon, Feb 24, 2020 at 06:17:41PM +0100, Laszlo Ersek wrote: > In edk2 commit 333f32ec23dd, QemuVideoDxe gained support for QEMU's > "secondary-vga" device model (originally introduced in QEMU commit > 63e3e24db2e9). >=20 > In QEMU commit 765c94290863, the "bochs-display" device was introduced, > which would work with QemuVideoDxe out of the box, reusing the > "secondary-vga" logic. >=20 > Support for both models has been broken since edk2 commit 662bd0da7fd7. > Said patch ended up requiring VGA IO Ports -- i.e., at least one of > EFI_PCI_IO_ATTRIBUTE_VGA_IO and EFI_PCI_IO_ATTRIBUTE_VGA_IO_16 -- even if > the device wasn't actually VGA compatible. >=20 > Restrict the IO Ports requirement to VGA compatible devices. >=20 > Cc: Ard Biesheuvel > Cc: Gerd Hoffmann > Cc: Jordan Justen > Cc: Marc W Chen > Cc: Philippe Mathieu-Daud=E9 > Fixes: 662bd0da7fd77e4d2cf9ef4a78015af5cad7d9db > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2555 > Signed-off-by: Laszlo Ersek > --- >=20 > Notes: > Repo: https://github.com/lersek/edk2.git > Branch: vga_io_bz_2555 >=20 > OvmfPkg/QemuVideoDxe/Driver.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/OvmfPkg/QemuVideoDxe/Driver.c b/OvmfPkg/QemuVideoDxe/Driver.= c > index 6a4a860b3c25..37bbbbe843c9 100644 > --- a/OvmfPkg/QemuVideoDxe/Driver.c > +++ b/OvmfPkg/QemuVideoDxe/Driver.c > @@ -292,7 +292,7 @@ QemuVideoControllerDriverStart ( > } > =20 > SupportedVgaIo &=3D (UINT64)(EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_= ATTRIBUTE_VGA_IO_16); > - if (SupportedVgaIo =3D=3D 0) { > + if (SupportedVgaIo =3D=3D 0 && IS_PCI_VGA (&Pci)) { > Status =3D EFI_UNSUPPORTED; > goto ClosePciIo; > } Reviewed-by: Gerd Hoffmann