[src/trunk]: src/sys/external/bsd/drm2/dist/drm Restore the callback approach...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d62a4aeb0362
branches:  trunk
changeset: 1027893:d62a4aeb0362
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 01:08:25 2021 +0000

description:
Restore the callback approach to removing PCI tentacles.

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_ioctl.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 4f3bff0248fd -r d62a4aeb0362 sys/external/bsd/drm2/dist/drm/drm_ioctl.c
--- a/sys/external/bsd/drm2/dist/drm/drm_ioctl.c        Sun Dec 19 01:08:15 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_ioctl.c        Sun Dec 19 01:08:25 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_ioctl.c,v 1.13 2021/12/18 23:44:57 riastradh Exp $ */
+/*     $NetBSD: drm_ioctl.c,v 1.14 2021/12/19 01:08:25 riastradh Exp $ */
 
 /*
  * Created: Fri Jan  8 09:01:26 1999 by faith%valinux.com@localhost
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_ioctl.c,v 1.13 2021/12/18 23:44:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_ioctl.c,v 1.14 2021/12/19 01:08:25 riastradh Exp $");
 
 #include <linux/export.h>
 #include <linux/nospec.h>
@@ -155,8 +155,8 @@
        if (master->unique != NULL)
                drm_unset_busid(dev, master);
 
-       if (dev->dev && dev_is_pci(dev->dev)) {
-               ret = drm_pci_set_busid(dev, master);
+       if (dev->driver->set_busid) {
+               ret = dev->driver->set_busid(dev, master);
                if (ret) {
                        drm_unset_busid(dev, master);
                        return ret;