From 6f9939525c31f1f2d8d6c137a46404278384b4bf Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 26 Jun 2017 12:43:54 -0400 Subject: [PATCH] modesetting: Fix PCI initialization on non-zero domains libdrm's busid matching for the legacy three-integer bus string format simply ignores the domain number, rather than what we were doing here of packing the domain into the bus number. Whatever, just use the existing code to build a busid string, since that gets the domain right. Signed-off-by: Adam Jackson --- hw/xfree86/drivers/modesetting/driver.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c index f371198a9..21e75c762 100644 --- a/hw/xfree86/drivers/modesetting/driver.c +++ b/hw/xfree86/drivers/modesetting/driver.c @@ -851,13 +851,11 @@ ms_get_drm_master_fd(ScrnInfoPtr pScrn) PciInfo = xf86GetPciInfoForEntity(ms->pEnt->index); if (PciInfo) { - BusID = XNFalloc(64); - sprintf(BusID, "PCI:%d:%d:%d", - ((PciInfo->domain << 8) | PciInfo->bus), - PciInfo->dev, PciInfo->func); + if ((BusID = ms_DRICreatePCIBusID(PciInfo)) != NULL) { + ms->fd = drmOpen(NULL, BusID); + free(BusID); + } } - ms->fd = drmOpen(NULL, BusID); - free(BusID); } else #endif