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.web10.1398.1582663886836480107 for ; Tue, 25 Feb 2020 12:51:27 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JHoqTFEN; spf=pass (domain: redhat.com, ip: 205.139.110.120, mailfrom: philmd@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582663886; 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=6i9jfrCk/89/jmw//Q0aK1n7W/HQTp9he6GZFspD6w8=; b=JHoqTFENsbWz6QUchqQ78zEBYU1iMOldjq4iguWAzcw3SdWRoT35nyvho/BDZFEPg1B11/ LDNNyCFUR9PjxFdb/KXmEeT6r4rbzth/ux9uaTxGusnT6INxqMm+9NkrfAAAUIlughswR6 xocxT9ds0nu3gWZGNhMoTpgI1z5kpIQ= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-250-UVUIFxboOluwK88p6OflJQ-1; Tue, 25 Feb 2020 15:51:19 -0500 X-MC-Unique: UVUIFxboOluwK88p6OflJQ-1 Received: by mail-wr1-f72.google.com with SMTP id t3so372011wrp.2 for ; Tue, 25 Feb 2020 12:51:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Im8lmB3G4ibqTSCCz330Akc40gRTMwJC+RzZv+4oGXU=; b=Q/AzactV3dcgccxYo/PVSLVhwDp8wlyfN9mXv6YBieTc7Ff0sgPJyfhyuDxl8Xk+9n 9bDdByo05aqcC0PA7MreS2IVcaagvxx10mKi6bxFaMZkXOgy6hU3f2Z4uB6MaIVbzFvl U9lprQE/bN+bUt71XjCw/gMXxTuLBV4qN8kow2ehzb0Wn2TJFluqtO7bxKJBdvv3i3af ocIDrQUKjkFVlhXdcv7uWHnmZF1/O7TReLXutreTc9vXgEEwIP+zFC41p0gGvZ8uY720 Bi3FnT8ZUrO+l951uFqrmLsA2zTyMCF+WSygSfZk0mvhtXqkEzqKw3baYEF/84XY+T0J hvlw== X-Gm-Message-State: APjAAAUQOQh+9PWSoB75PNfuHLXW+CzomOF+x6Ip0jvMw2anw48WvIAB wFWj8BVgJBVR9R5Pd6yAl3HQ6s6Rg6EmBvKUyOmcEElJ514mO6YATOCucfv7llIMQU9ks3zsolX VmOnxSAHw42W6fw== X-Received: by 2002:adf:f581:: with SMTP id f1mr983660wro.264.1582663877719; Tue, 25 Feb 2020 12:51:17 -0800 (PST) X-Google-Smtp-Source: APXvYqwyUT7vUs5qX761Hum99R1wYAmvGXGBtYGwAFtapf6UGC8Sig02goQ11Om4EFaGzEfLvcyhAQ== X-Received: by 2002:adf:f581:: with SMTP id f1mr983643wro.264.1582663877468; Tue, 25 Feb 2020 12:51:17 -0800 (PST) Return-Path: Received: from [192.168.1.35] (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id u4sm80133wrt.37.2020.02.25.12.51.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 25 Feb 2020 12:51:16 -0800 (PST) Subject: Re: [PATCH edk2-stable202002] OvmfPkg/QemuVideoDxe: unbreak "secondary-vga" and "bochs-display" support To: Laszlo Ersek , edk2-devel-groups-io Cc: Ard Biesheuvel , Gerd Hoffmann , Jordan Justen , Marc W Chen References: <20200224171741.7494-1-lersek@redhat.com> From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= Message-ID: <8bd42e8f-20cd-64c9-eba0-deeee5d370a9@redhat.com> Date: Tue, 25 Feb 2020 21:51:15 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <20200224171741.7494-1-lersek@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Laszlo, On 2/24/20 6:17 PM, 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)) { I'm having hard time to understand. Before we could have a video PCI=20 controller which was not VGA? What about the other IS_PCI_OLD_VGA() macro? > Status =3D EFI_UNSUPPORTED; > goto ClosePciIo; > } >=20 > base-commit: 1d3215fd24f47eaa4877542a59b4bbf5afc0cfe8 >=20