mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 23:33:54 -06:00
vfio/igd: Detect IGD device by OpRegion
There is currently no straightforward way to distinguish if a Intel graphics device is IGD or discrete GPU. However, only IGD devices have OpRegion. Use the presence of VFIO_REGION_SUBTYPE_INTEL_IGD_OPREGION to identify IGD devices. Still, OpRegion on hotplugged IGD device is not supported. Signed-off-by: Tomita Moeko <tomitamoeko@gmail.com> Reviewed-by: Corvin Köhne <c.koehne@beckhoff.com> Reviewed-by: Alex Williamson <alex.williamson@redhat.com> Tested-by: Alex Williamson <alex.williamson@redhat.com> Link: https://lore.kernel.org/qemu-devel/20250505170305.23622-4-tomitamoeko@gmail.com Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
parent
1d5f84f349
commit
c0273e77f2
1 changed files with 16 additions and 14 deletions
|
@ -185,9 +185,10 @@ static bool vfio_pci_igd_opregion_init(VFIOPCIDevice *vdev,
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool vfio_pci_igd_setup_opregion(VFIOPCIDevice *vdev, Error **errp)
|
static bool vfio_pci_igd_opregion_detect(VFIOPCIDevice *vdev,
|
||||||
|
struct vfio_region_info **opregion,
|
||||||
|
Error **errp)
|
||||||
{
|
{
|
||||||
g_autofree struct vfio_region_info *opregion = NULL;
|
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
/* Hotplugging is not supported for opregion access */
|
/* Hotplugging is not supported for opregion access */
|
||||||
|
@ -198,17 +199,13 @@ static bool vfio_pci_igd_setup_opregion(VFIOPCIDevice *vdev, Error **errp)
|
||||||
|
|
||||||
ret = vfio_device_get_region_info_type(&vdev->vbasedev,
|
ret = vfio_device_get_region_info_type(&vdev->vbasedev,
|
||||||
VFIO_REGION_TYPE_PCI_VENDOR_TYPE | PCI_VENDOR_ID_INTEL,
|
VFIO_REGION_TYPE_PCI_VENDOR_TYPE | PCI_VENDOR_ID_INTEL,
|
||||||
VFIO_REGION_SUBTYPE_INTEL_IGD_OPREGION, &opregion);
|
VFIO_REGION_SUBTYPE_INTEL_IGD_OPREGION, opregion);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
error_setg_errno(errp, -ret,
|
error_setg_errno(errp, -ret,
|
||||||
"Device does not supports IGD OpRegion feature");
|
"Device does not supports IGD OpRegion feature");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!vfio_pci_igd_opregion_init(vdev, opregion, errp)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -480,6 +477,7 @@ void vfio_probe_igd_bar0_quirk(VFIOPCIDevice *vdev, int nr)
|
||||||
|
|
||||||
static bool vfio_pci_igd_config_quirk(VFIOPCIDevice *vdev, Error **errp)
|
static bool vfio_pci_igd_config_quirk(VFIOPCIDevice *vdev, Error **errp)
|
||||||
{
|
{
|
||||||
|
g_autofree struct vfio_region_info *opregion = NULL;
|
||||||
int ret, gen;
|
int ret, gen;
|
||||||
uint64_t gms_size;
|
uint64_t gms_size;
|
||||||
uint64_t *bdsm_size;
|
uint64_t *bdsm_size;
|
||||||
|
@ -487,16 +485,17 @@ static bool vfio_pci_igd_config_quirk(VFIOPCIDevice *vdev, Error **errp)
|
||||||
bool legacy_mode_enabled = false;
|
bool legacy_mode_enabled = false;
|
||||||
Error *err = NULL;
|
Error *err = NULL;
|
||||||
|
|
||||||
/*
|
|
||||||
* This must be an Intel VGA device at address 00:02.0 for us to even
|
|
||||||
* consider enabling legacy mode. The vBIOS has dependencies on the
|
|
||||||
* PCI bus address.
|
|
||||||
*/
|
|
||||||
if (!vfio_pci_is(vdev, PCI_VENDOR_ID_INTEL, PCI_ANY_ID) ||
|
if (!vfio_pci_is(vdev, PCI_VENDOR_ID_INTEL, PCI_ANY_ID) ||
|
||||||
!vfio_is_vga(vdev)) {
|
!vfio_is_vga(vdev)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* IGD device always comes with OpRegion */
|
||||||
|
if (!vfio_pci_igd_opregion_detect(vdev, &opregion, errp)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
info_report("OpRegion detected on Intel display %x.", vdev->device_id);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* IGD is not a standard, they like to change their specs often. We
|
* IGD is not a standard, they like to change their specs often. We
|
||||||
* only attempt to support back to SandBridge and we hope that newer
|
* only attempt to support back to SandBridge and we hope that newer
|
||||||
|
@ -572,7 +571,7 @@ static bool vfio_pci_igd_config_quirk(VFIOPCIDevice *vdev, Error **errp)
|
||||||
|
|
||||||
/* Setup OpRegion access */
|
/* Setup OpRegion access */
|
||||||
if ((vdev->features & VFIO_FEATURE_ENABLE_IGD_OPREGION) &&
|
if ((vdev->features & VFIO_FEATURE_ENABLE_IGD_OPREGION) &&
|
||||||
!vfio_pci_igd_setup_opregion(vdev, errp)) {
|
!vfio_pci_igd_opregion_init(vdev, opregion, errp)) {
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -672,8 +671,11 @@ error:
|
||||||
*/
|
*/
|
||||||
static bool vfio_pci_kvmgt_config_quirk(VFIOPCIDevice *vdev, Error **errp)
|
static bool vfio_pci_kvmgt_config_quirk(VFIOPCIDevice *vdev, Error **errp)
|
||||||
{
|
{
|
||||||
|
g_autofree struct vfio_region_info *opregion = NULL;
|
||||||
|
|
||||||
if ((vdev->features & VFIO_FEATURE_ENABLE_IGD_OPREGION) &&
|
if ((vdev->features & VFIO_FEATURE_ENABLE_IGD_OPREGION) &&
|
||||||
!vfio_pci_igd_setup_opregion(vdev, errp)) {
|
(!vfio_pci_igd_opregion_detect(vdev, &opregion, errp) ||
|
||||||
|
!vfio_pci_igd_opregion_init(vdev, opregion, errp))) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue