Module Name: src
Committed By: riastradh
Date: Sun Dec 19 01:08:35 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_ioctl.c
Log Message:
Fix up drm ioctl.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 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.14 src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.15
--- src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.14 Sun Dec 19 01:08:25 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c Sun Dec 19 01:08:35 2021
@@ -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 fa...@valinux.com
@@ -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 @@ static const struct drm_ioctl_desc drm_i
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;
