From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 13 Apr 2026 17:50:06 +0000 (-0500)
Subject: Merge branch 'pci/vga'
X-Git-Tag: v7.1-rc1~151^2~22
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=a09007a782687d8322e3aa31b7cc9ce0be223656;p=thirdparty%2Flinux.git

Merge branch 'pci/vga'

- Return vga_get_uninterruptible() back to userspace in the
  /dev/vga_arbiter path so user can tell whether VGA routing was updated
  (Simon Richter)

- Make pci_set_vga_state() fail if bridge doesn't support VGA routing,
  i.e., PCI_BRIDGE_CTL_VGA is not writable, and return errors up to
  vga_get() callers (Simon Richter)

* pci/vga:
  PCI/VGA: Fail pci_set_vga_state() if VGA decoding not supported
  PCI/VGA: Pass errors from pci_set_vga_state() up
  PCI/VGA: Pass vga_get_uninterruptible() errors to userspace
---

a09007a782687d8322e3aa31b7cc9ce0be223656