From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.120]) by mx.groups.io with SMTP id smtpd.web09.11307.1582735882436463215 for ; Wed, 26 Feb 2020 08:51:22 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ILAQb0s7; spf=pass (domain: redhat.com, ip: 205.139.110.120, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582735881; h=from:from:reply-to: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=rqC+v/XqIRs7z3kvPDaLdbEiDccEBW9+eaYXLgNBHjs=; b=ILAQb0s7MkY83hoF/y5NdrSlYzs+TlEuqEaQM2HIliOWwf82cK8U9iRIfFcrm3mT6peFI9 Am47pY3dmxB4YoGATG21Fj1wI9ImvndKID0tsADaw7odmCnf8efJywq1jZT3sw0MeZw1XI IoirAfbeYC/nanel/84leY9+Ppf7uMQ= 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-20-aPJzGwlUMuWLpFRfOckicw-1; Wed, 26 Feb 2020 11:51:13 -0500 X-MC-Unique: aPJzGwlUMuWLpFRfOckicw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EBEA3107ACCA; Wed, 26 Feb 2020 16:51:11 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-185.ams2.redhat.com [10.36.116.185]) by smtp.corp.redhat.com (Postfix) with ESMTP id C848E5C28D; Wed, 26 Feb 2020 16:51:07 +0000 (UTC) Subject: Re: [edk2-devel] [PATCH edk2-stable202002] OvmfPkg/QemuVideoDxe: unbreak "secondary-vga" and "bochs-display" support From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Gerd Hoffmann , Jordan Justen , Marc W Chen , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Liming Gao Reply-To: devel@edk2.groups.io, lersek@redhat.com References: <20200224171741.7494-1-lersek@redhat.com> Message-ID: <362de9d1-615d-8506-8c63-358e2504fa84@redhat.com> Date: Wed, 26 Feb 2020 17:51:06 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200224171741.7494-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 02/24/20 18:17, 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=C3=A9 > 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; > } >=20 > base-commit: 1d3215fd24f47eaa4877542a59b4bbf5afc0cfe8 >=20 Thanks everyone for the feedback; pushed as commit edfe16a6d9f8 via . Laszlo