 @@ -1,14 +1,14 @@
-/*	$NetBSD: drmP.h,v 1.54 2021/12/19 01:56:42 riastradh Exp $	*/
+/*	$NetBSD: drmP.h,v 1.55 2021/12/19 01:56:50 riastradh Exp $	*/
 /*
  * Internal Header for the Direct Rendering Manager
+ *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * Copyright (c) 2009-2010, Code Aurora Forum.
  * All rights reserved.
+ *
  * Author: Rickard E. (Rik) Faith <faith@valinux.com>
  * Author: Gareth Hughes <gareth@valinux.com>
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
 @@ -149,109 +149,26 @@ struct drm_pending_event {
 	struct list_head link;
 	struct drm_file *file_priv;
 	pid_t pid; /* pid of requester, no guarantee it's valid by the time
 		      we deliver the event, for tracing only */
 	void (*destroy)(struct drm_pending_event *event);
 };
 /* initial implementaton using a linked list - todo hashtab */
 struct drm_prime_file_private {
 	struct list_head head;
 	struct mutex lock;
 };
 /** File private data */
 struct drm_file {
 	unsigned authenticated :1;
 	/* Whether we're master for a minor. Protected by master_mutex */
 	unsigned is_master :1;
 	/* true when the client has asked us to expose stereo 3D mode flags */
 	unsigned stereo_allowed :1;
 	/*
 	 * true if client understands CRTC primary planes and cursor planes
 	 * in the plane list
 	 */
 	unsigned universal_planes:1;
 	/* true if client understands atomic properties */
 	unsigned atomic:1;
 	/*
 	 * This client is allowed to gain master privileges for @master.
 	 * Protected by struct drm_device::master_mutex.
 	 */
 	unsigned allowed_master:1;
 #ifndef __NetBSD__
 	struct pid *pid;
 	kuid_t uid;
 #endif
 	drm_magic_t magic;
 	struct list_head lhead;
 	struct drm_minor *minor;
 	unsigned long lock_count;
 	/** Mapping of mm object handles to object pointers. */
 	struct idr object_idr;
 	/** Lock for synchronization of access to object_idr. */
 	spinlock_t table_lock;
 	struct file *filp;
 	void *driver_priv;
 	struct drm_master *master; /* master this node is currently associated with
 				      N.B. not always minor->master */
 	/**
 	 * fbs - List of framebuffers associated with this file.
 	 * Protected by fbs_lock. Note that the fbs list holds a reference on
 	 * the fb object to prevent it from untimely disappearing.
 	 */
 	struct list_head fbs;
 	struct mutex fbs_lock;
 	/** User-created blob properties; this retains a reference on the
 	 *  property. */
 	struct list_head blobs;
 #ifdef __NetBSD__
 	drm_waitqueue_t event_wait;
 	struct selinfo event_selq;
 #else
 	wait_queue_head_t event_wait;
 #endif
 	struct list_head event_list;
 	int event_space;
 	struct drm_prime_file_private prime;
 };
 /**
  * Lock data.
  */
 struct drm_lock_data {
 	struct drm_hw_lock *hw_lock;	/**< Hardware lock */
 	/** Private of lock holder's file (NULL=kernel) */
 	struct drm_file *file_priv;
 #ifdef __NetBSD__
 	drm_waitqueue_t lock_queue;	/**< Queue of blocked processes */
 #else
 	wait_queue_head_t lock_queue;	/**< Queue of blocked processes */
 #endif
 	unsigned long lock_time;	/**< Time of last lock in jiffies */
 	spinlock_t spinlock;
 	uint32_t kernel_waiters;
 	uint32_t user_waiters;
 	int idle_has_lock;
 };
 /**
  * struct drm_master - drm master structure
+ *
  * @refcount: Refcount for this master object.
  * @minor: Link back to minor char device we are master for. Immutable.
  * @unique: Unique identifier: e.g. busid. Protected by drm_global_mutex.
  * @unique_len: Length of unique field. Protected by drm_global_mutex.
  * @magic_map: Map of used authentication tokens. Protected by struct_mutex.
  * @lock: DRI lock information.
  * @driver_priv: Pointer to driver-private information.
  */
 struct drm_master {
 	struct kref refcount;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: drm_file.h,v 1.4 2021/12/19 00:58:04 riastradh Exp $	*/
+/*	$NetBSD: drm_file.h,v 1.5 2021/12/19 01:56:50 riastradh Exp $	*/
 /*
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * Copyright (c) 2009-2010, Code Aurora Forum.
  * All rights reserved.
+ *
  * Author: Rickard E. (Rik) Faith <faith@valinux.com>
  * Author: Gareth Hughes <gareth@valinux.com>
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
 @@ -220,28 +220,30 @@ struct drm_file {
 	/**
 	 * @master:
+	 *
 	 * Master this node is currently associated with. Only relevant if
 	 * drm_is_primary_client() returns true. Note that this only
 	 * matches &drm_device.master if the master is the currently active one.
+	 *
 	 * See also @authentication and @is_master and the :ref:`section on
 	 * primary nodes and authentication <drm_primary_node>`.
 	 */
 	struct drm_master *master;
 #ifndef __NetBSD__
 	/** @pid: Process that opened this file. */
 	struct pid *pid;
 #endif
 	/** @magic: Authentication magic, see @authenticated. */
 	drm_magic_t magic;
 	/**
 	 * @lhead:
+	 *
 	 * List of all open files of a DRM device, linked into
 	 * &drm_device.filelist. Protected by &drm_device.filelist_mutex.
 	 */
 	struct list_head lhead;
 	/** @minor: &struct drm_minor for this file. */
 @@ -289,27 +291,32 @@ struct drm_file {
 	struct mutex fbs_lock;
 	/**
 	 * @blobs:
+	 *
 	 * User-created blob properties; this retains a reference on the
 	 * property.
+	 *
 	 * Protected by @drm_mode_config.blob_lock;
 	 */
 	struct list_head blobs;
 	/** @event_wait: Waitqueue for new events added to @event_list. */
 #ifdef __NetBSD__
 	drm_waitqueue_t event_wait;
 	struct selinfo event_selq;
 #else
 	wait_queue_head_t event_wait;
 #endif
 	/**
 	 * @pending_event_list:
+	 *
 	 * List of pending &struct drm_pending_event, used to clean up pending
 	 * events in case this file gets closed before the event is signalled.
 	 * Uses the &drm_pending_event.pending_link entry.
+	 *
 	 * Protect by &drm_device.event_lock.
 	 */
 	struct list_head pending_event_list;
 	/**