Module Name: src
Committed By: riastradh
Date: Sun Dec 19 10:51:39 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_ioctl.c
src/sys/external/bsd/drm2/dist/include/drm: drm_drv.h drm_pci.h
Log Message:
Restore set_busid callback.
This local change is intentional to keep pci tentacles out of the
main drm.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/dist/include/drm/drm_drv.h
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h
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/dist/drm/drm_ioctl.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.19 src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.20
--- src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.19 Sun Dec 19 09:52:09 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c Sun Dec 19 10:51:39 2021
@@ -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 fa...@valinux.com
@@ -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 @@ static int drm_set_busid(struct drm_devi
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;
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_drv.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_drv.h:1.6 src/sys/external/bsd/drm2/dist/include/drm/drm_drv.h:1.7
--- src/sys/external/bsd/drm2/dist/include/drm/drm_drv.h:1.6 Sun Dec 19 09:55:05 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_drv.h Sun Dec 19 10:51:39 2021
@@ -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 @@ struct drm_driver {
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;
};
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h:1.5 src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h:1.6
--- src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h:1.5 Sun Dec 19 10:47:30 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h Sun Dec 19 10:51:39 2021
@@ -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 @@ extern int drm_pci_attach(device_t, cons
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_ */
