[PATCH][Zesty][SRU 1/1] UBUNTU: SAUCE: drm: hibmc: Use set_busid function from drm core

Daniel Axtens daniel.axtens at canonical.com
Tue Jun 20 03:53:47 UTC 2017


BugLink: https://bugs.launchpad.net/bugs/1698700

Currently, calling drmGetBusid from libdrm on a hibmc VGA
card returns a string like "0007:a1:00.0".

The busid reported by most cards begins with "pci:". For
example, on an amd64 system, a VGA card reported
"pci:0000:00:02.0".

The missing "pci:" prefix confuses Xorg and leads to crashes
and other misbehaviour.[0]

Use the standard helper from the drm core to set the busid to
include the "pci:" prefix. This is done by many other drivers.

With this patch, Xorg can be run successfully.

[0]: https://bugs.launchpad.net/ubuntu/+source/xorg/+bug/1691991

Cc: Xinliang Liu <z.liuxinliang at hisilicon.com>
Cc: Rongrong Zou <zourongrong at gmail.com>
Signed-off-by: Daniel Axtens <dja at axtens.net>
---
 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
index 7e2043f4348c..65e0b3c65fa3 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
@@ -92,6 +92,7 @@ static struct drm_driver hibmc_driver = {
 	.dumb_map_offset        = hibmc_dumb_mmap_offset,
 	.dumb_destroy           = drm_gem_dumb_destroy,
 	.irq_handler		= hibmc_drm_interrupt,
+	.set_busid		= drm_pci_set_busid,
 };
 
 static int __maybe_unused hibmc_pm_suspend(struct device *dev)
-- 
2.11.0





More information about the kernel-team mailing list