Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm Fix up drm ioctl.



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

description:
Fix up drm ioctl.

diffstat:

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

diffs (41 lines):

diff -r d62a4aeb0362 -r c9740bdbd0b9 sys/external/bsd/drm2/dist/drm/drm_ioctl.c
--- a/sys/external/bsd/drm2/dist/drm/drm_ioctl.c        Sun Dec 19 01:08:25 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_ioctl.c        Sun Dec 19 01:08:35 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_ioctl.c,v 1.14 2021/12/19 01:08:25 riastradh Exp $ */
+/*     $NetBSD: drm_ioctl.c,v 1.15 2021/12/19 01:08:35 riastradh Exp $ */
 
 /*
  * Created: Fri Jan  8 09:01:26 1999 by faith%valinux.com@localhost
@@ -31,13 +31,18 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_ioctl.c,v 1.14 2021/12/19 01:08:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_ioctl.c,v 1.15 2021/12/19 01:08:35 riastradh Exp $");
 
 #include <linux/export.h>
 #include <linux/nospec.h>
 #include <linux/pci.h>
 #include <linux/uaccess.h>
 
+#ifdef __NetBSD__
+#include <sys/types.h>
+#include <sys/file.h>
+#endif
+
 #include <drm/drm_agpsupport.h>
 #include <drm/drm_auth.h>
 #include <drm/drm_crtc.h>
@@ -779,7 +784,11 @@
 long drm_ioctl_kernel(struct file *file, drm_ioctl_t *func, void *kdata,
                      u32 flags)
 {
+#ifdef __NetBSD__
+       struct drm_file *file_priv = file->f_data;
+#else
        struct drm_file *file_priv = file->private_data;
+#endif
        struct drm_device *dev = file_priv->minor->dev;
        int retcode;
 



Home | Main Index | Thread Index | Old Index