public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Ard Biesheuvel" <ardb@kernel.org>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: devel@edk2.groups.io, Oliver Steffen <osteffen@redhat.com>,
	 Pawel Polawski <ppolawsk@redhat.com>,
	Jiewen Yao <jiewen.yao@intel.com>,
	 Jordan Justen <jordan.l.justen@intel.com>
Subject: Re: [PATCH v3 1/1] OvmfPkg/QemuVideoDxe: fix bochs mode init
Date: Wed, 7 Sep 2022 11:44:35 +0200	[thread overview]
Message-ID: <CAMj1kXHXc8iVXr=NJGw5d3imo+UTmzdZAhQzc6dzkdkmKBmDdA@mail.gmail.com> (raw)
In-Reply-To: <20220907091504.3152616-1-kraxel@redhat.com>

On Wed, 7 Sept 2022 at 11:15, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> Add VgaInb() helper function to read vga registers.  With that in place
> fix the unblanking.  We need to put the ATT_ADDRESS_REGISTER flip flop
> into a known state, which is done by reading the
> INPUT_STATUS_1_REGISTER.  Reading the INPUT_STATUS_1_REGISTER only works
> when the device is in color mode, so make sure that bit (0x01) is set in
> MISC_OUTPUT_REGISTER.
>
> Currently the mode setting works more by luck because
> ATT_ADDRESS_REGISTER flip flop happens to be in the state we need.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Merged as #3310

Thanks,

> ---
>  OvmfPkg/QemuVideoDxe/Driver.c | 33 ++++++++++++++++++++++++++++++++-
>  1 file changed, 32 insertions(+), 1 deletion(-)
>
> diff --git a/OvmfPkg/QemuVideoDxe/Driver.c b/OvmfPkg/QemuVideoDxe/Driver.c
> index b91909a14e59..1f9ba046ef04 100644
> --- a/OvmfPkg/QemuVideoDxe/Driver.c
> +++ b/OvmfPkg/QemuVideoDxe/Driver.c
> @@ -984,6 +984,33 @@ VgaOutb (
>    }
>  }
>
> +UINT8
> +VgaInb (
> +  QEMU_VIDEO_PRIVATE_DATA  *Private,
> +  UINTN                    Reg
> +  )
> +{
> +  EFI_STATUS  Status;
> +  UINT8       Data;
> +
> +  if (Private->Variant == QEMU_VIDEO_BOCHS_MMIO) {
> +    Data   = 0;
> +    Status = Private->PciIo->Mem.Read (
> +                                   Private->PciIo,
> +                                   EfiPciIoWidthUint8,
> +                                   PCI_BAR_IDX2,
> +                                   0x400 - 0x3c0 + Reg,
> +                                   1,
> +                                   &Data
> +                                   );
> +    ASSERT_EFI_ERROR (Status);
> +  } else {
> +    Data = inb (Private, Reg);
> +  }
> +
> +  return Data;
> +}
> +
>  VOID
>  InitializeBochsGraphicsMode (
>    QEMU_VIDEO_PRIVATE_DATA  *Private,
> @@ -998,7 +1025,11 @@ InitializeBochsGraphicsMode (
>      ModeData->ColorDepth
>      ));
>
> -  /* unblank */
> +  /* set color mode */
> +  VgaOutb (Private, MISC_OUTPUT_REGISTER, 0x01);
> +
> +  /* reset flip flop + unblank */
> +  VgaInb (Private, INPUT_STATUS_1_REGISTER);
>    VgaOutb (Private, ATT_ADDRESS_REGISTER, 0x20);
>
>    BochsWrite (Private, VBE_DISPI_INDEX_ENABLE, 0);
> --
> 2.37.3
>

  reply	other threads:[~2022-09-07  9:44 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-07  9:15 [PATCH v3 1/1] OvmfPkg/QemuVideoDxe: fix bochs mode init Gerd Hoffmann
2022-09-07  9:44 ` Ard Biesheuvel [this message]
2022-09-07  9:54 ` Gerd Hoffmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAMj1kXHXc8iVXr=NJGw5d3imo+UTmzdZAhQzc6dzkdkmKBmDdA@mail.gmail.com' \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox