Module Name: src
Committed By: riastradh
Date: Mon Aug 27 14:20:11 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/drm: drm_fops.c
Log Message:
Make sure all of struct drm_file gets initialized.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/drm/drm_fops.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/drm/drm_fops.c
diff -u src/sys/external/bsd/drm2/drm/drm_fops.c:1.12 src/sys/external/bsd/drm2/drm/drm_fops.c:1.13
--- src/sys/external/bsd/drm2/drm/drm_fops.c:1.12 Mon Aug 27 14:15:24 2018
+++ src/sys/external/bsd/drm2/drm/drm_fops.c Mon Aug 27 14:20:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_fops.c,v 1.12 2018/08/27 14:15:24 riastradh Exp $ */
+/* $NetBSD: drm_fops.c,v 1.13 2018/08/27 14:20:11 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_fops.c,v 1.12 2018/08/27 14:15:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_fops.c,v 1.13 2018/08/27 14:20:11 riastradh Exp $");
#include <sys/param.h>
#include <sys/select.h>
@@ -56,6 +56,8 @@ drm_open_file(struct drm_file *file, voi
file->is_master = false;
file->stereo_allowed = false;
file->universal_planes = false;
+ file->atomic = false;
+ file->allowed_master = false;
file->magic = 0;
INIT_LIST_HEAD(&file->lhead);
file->minor = minor;
@@ -67,10 +69,12 @@ drm_open_file(struct drm_file *file, voi
file->master = NULL;
INIT_LIST_HEAD(&file->fbs);
linux_mutex_init(&file->fbs_lock);
+ INIT_LIST_HEAD(&file->blobs);
DRM_INIT_WAITQUEUE(&file->event_wait, "drmevent");
selinit(&file->event_selq);
INIT_LIST_HEAD(&file->event_list);
file->event_space = 0x1000; /* XXX cargo-culted from Linux */
+ /* file->prime is initialized by drm_prime_init_file_private. */
if (drm_core_check_feature(dev, DRIVER_GEM))
drm_gem_open(dev, file);
