Module Name: src
Committed By: riastradh
Date: Sun Dec 19 09:48:45 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_ioctl.c
Log Message:
undo local diff, set_busid is gone
Author: Maya Rashish <m...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/dist/drm/drm_ioctl.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/dist/drm/drm_ioctl.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.16 src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.17
--- src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.16 Sun Dec 19 09:48:37 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c Sun Dec 19 09:48:45 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_ioctl.c,v 1.16 2021/12/19 09:48:37 riastradh Exp $ */
+/* $NetBSD: drm_ioctl.c,v 1.17 2021/12/19 09:48:45 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.16 2021/12/19 09:48:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_ioctl.c,v 1.17 2021/12/19 09:48:45 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->driver->set_busid) {
- ret = dev->driver->set_busid(dev, master);
+ if (dev->dev && dev_is_pci(dev->pdev)) {
+ ret = drm_pci_set_busid(dev, master);
if (ret) {
drm_unset_busid(dev, master);
return ret;
