Module Name: src
Committed By: riastradh
Date: Wed Jul 20 01:20:20 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/linux: linux_pci.c
src/sys/external/bsd/drm2/pci: drm_pci_busid.c
Log Message:
drm: Use real pci segment number, not pciN device unit.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/drm2/linux/linux_pci.c
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/pci/drm_pci_busid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/linux/linux_pci.c
diff -u src/sys/external/bsd/drm2/linux/linux_pci.c:1.22 src/sys/external/bsd/drm2/linux/linux_pci.c:1.23
--- src/sys/external/bsd/drm2/linux/linux_pci.c:1.22 Tue Jul 19 22:24:34 2022
+++ src/sys/external/bsd/drm2/linux/linux_pci.c Wed Jul 20 01:20:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_pci.c,v 1.22 2022/07/19 22:24:34 riastradh Exp $ */
+/* $NetBSD: linux_pci.c,v 1.23 2022/07/20 01:20:20 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_pci.c,v 1.22 2022/07/19 22:24:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_pci.c,v 1.23 2022/07/20 01:20:20 riastradh Exp $");
#if NACPICA > 0
#include <dev/acpi/acpivar.h>
@@ -724,7 +724,7 @@ int
pci_domain_nr(struct pci_bus *bus)
{
- return device_unit(bus->pb_dev);
+ return pci_get_segment(bus->pb_pc);
}
/*
Index: src/sys/external/bsd/drm2/pci/drm_pci_busid.c
diff -u src/sys/external/bsd/drm2/pci/drm_pci_busid.c:1.1 src/sys/external/bsd/drm2/pci/drm_pci_busid.c:1.2
--- src/sys/external/bsd/drm2/pci/drm_pci_busid.c:1.1 Sun Dec 19 11:09:48 2021
+++ src/sys/external/bsd/drm2/pci/drm_pci_busid.c Wed Jul 20 01:20:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_pci_busid.c,v 1.1 2021/12/19 11:09:48 riastradh Exp $ */
+/* $NetBSD: drm_pci_busid.c,v 1.2 2022/07/20 01:20:20 riastradh Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_pci_busid.c,v 1.1 2021/12/19 11:09:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci_busid.c,v 1.2 2022/07/20 01:20:20 riastradh Exp $");
#include <sys/types.h>
#include <sys/device.h>
@@ -52,7 +52,7 @@ drm_pci_set_busid(struct drm_device *dev
KASSERT(dev_is_pci(dev->dev));
master->unique = kasprintf(GFP_KERNEL, "pci:%04x:%02x:%02x.%d",
- device_unit(device_parent(dev->dev)),
+ pci_domain_nr(dev->pdev->bus),
pa->pa_bus, pa->pa_device, pa->pa_function);
if (master->unique == NULL)
return -ENOMEM;
