[src/trunk]: src/sys/external/bsd/drm2/dist Restore set_busid callback.

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

details:   https://anonhg.NetBSD.org/src/rev/2951b6036fc4
branches:  trunk
changeset: 1028384:2951b6036fc4
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 10:51:39 2021 +0000

description:
Restore set_busid callback.

This local change is intentional to keep pci tentacles out of the
main drm.

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_ioctl.c       |  8 ++++----
 sys/external/bsd/drm2/dist/include/drm/drm_drv.h |  3 ++-
 sys/external/bsd/drm2/dist/include/drm/drm_pci.h |  3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diffs (63 lines):

diff -r ea3f263bd04f -r 2951b6036fc4 sys/external/bsd/drm2/dist/drm/drm_ioctl.c
--- a/sys/external/bsd/drm2/dist/drm/drm_ioctl.c        Sun Dec 19 10:51:31 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_ioctl.c        Sun Dec 19 10:51:39 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_ioctl.c,v 1.19 2021/12/19 09:52:09 riastradh Exp $ */
+/*     $NetBSD: drm_ioctl.c,v 1.20 2021/12/19 10:51:39 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.19 2021/12/19 09:52:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_ioctl.c,v 1.20 2021/12/19 10:51:39 riastradh Exp $");
 
 #include <linux/export.h>
 #include <linux/nospec.h>
@@ -161,8 +161,8 @@
        if (master->unique != NULL)
                drm_unset_busid(dev, master);
 
-       if (dev->dev && dev_is_pci(dev->pdev)) {
-               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;
diff -r ea3f263bd04f -r 2951b6036fc4 sys/external/bsd/drm2/dist/include/drm/drm_drv.h
--- a/sys/external/bsd/drm2/dist/include/drm/drm_drv.h  Sun Dec 19 10:51:31 2021 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drm_drv.h  Sun Dec 19 10:51:39 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_drv.h,v 1.6 2021/12/19 09:55:05 riastradh Exp $    */
+/*     $NetBSD: drm_drv.h,v 1.7 2021/12/19 10:51:39 riastradh Exp $    */
 
 /*
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -800,6 +800,7 @@
        int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv);
        int (*dma_quiescent) (struct drm_device *);
        int (*context_dtor) (struct drm_device *dev, int context);
+       int (*set_busid)(struct drm_device *dev, struct drm_master *master);
        int dev_priv_size;
 };
 
diff -r ea3f263bd04f -r 2951b6036fc4 sys/external/bsd/drm2/dist/include/drm/drm_pci.h
--- a/sys/external/bsd/drm2/dist/include/drm/drm_pci.h  Sun Dec 19 10:51:31 2021 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drm_pci.h  Sun Dec 19 10:51:39 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_pci.h,v 1.5 2021/12/19 10:47:30 riastradh Exp $    */
+/*     $NetBSD: drm_pci.h,v 1.6 2021/12/19 10:51:39 riastradh Exp $    */
 
 /*
  * Internal Header for the Direct Rendering Manager
@@ -80,6 +80,7 @@
     struct pci_dev *, struct drm_driver *, unsigned long,
     struct drm_device **);
 extern int drm_pci_detach(struct drm_device *, int);
+int drm_pci_set_busid(struct drm_device *, struct drm_master *);
 #endif
 
 #endif /* _DRM_PCI_H_ */