diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2022-07-27 09:41:25 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2022-07-27 09:41:25 +0200 |
| commit | 592c718e422de34b4c56ee66d2f02d3726b244ab (patch) | |
| tree | 448c9a1ac6df4811bc4e9583297153ae23b8dc28 /drivers/vfio | |
| parent | 84a20f35e6fa16504ad5ddfadb7586a6d694d8f6 (diff) | |
| parent | 2bc7ea71a73747a77e7f83bc085b0d2393235410 (diff) | |
Merge remote-tracking branch 'drm/drm-next' into drm-tip
# Conflicts:
# drivers/gpu/drm/amd/display/Kconfig
# drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
# drivers/gpu/drm/i915/gt/intel_engine_cs.c
# drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
Diffstat (limited to 'drivers/vfio')
| -rw-r--r-- | drivers/vfio/pci/vfio_pci_core.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c index a0d69ddaf90d..756d049bd9cf 100644 --- a/drivers/vfio/pci/vfio_pci_core.c +++ b/drivers/vfio/pci/vfio_pci_core.c @@ -10,6 +10,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include <linux/aperture.h> #include <linux/device.h> #include <linux/eventfd.h> #include <linux/file.h> @@ -1793,6 +1794,10 @@ static int vfio_pci_vga_init(struct vfio_pci_core_device *vdev) if (!vfio_pci_is_vga(pdev)) return 0; + ret = aperture_remove_conflicting_pci_devices(pdev, vdev->vdev.ops->name); + if (ret) + return ret; + ret = vga_client_register(pdev, vfio_pci_set_decode); if (ret) return ret; |