Module Name: src
Committed By: riastradh
Date: Sun Dec 19 09:49:24 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: drm_lock.c
Log Message:
Make our code follow CONFIG_DRM_LEGACY.
We might want to delete all this code later, but no rush.
Author: Maya Rashish <m...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/drm/drm_lock.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_lock.c
diff -u src/sys/external/bsd/drm2/drm/drm_lock.c:1.10 src/sys/external/bsd/drm2/drm/drm_lock.c:1.11
--- src/sys/external/bsd/drm2/drm/drm_lock.c:1.10 Sun Dec 19 00:57:29 2021
+++ src/sys/external/bsd/drm2/drm/drm_lock.c Sun Dec 19 09:49:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_lock.c,v 1.10 2021/12/19 00:57:29 riastradh Exp $ */
+/* $NetBSD: drm_lock.c,v 1.11 2021/12/19 09:49:24 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_lock.c,v 1.10 2021/12/19 00:57:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_lock.c,v 1.11 2021/12/19 09:49:24 riastradh Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -60,6 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: drm_lock.c,v
static bool drm_lock_acquire(struct drm_lock_data *, int);
static void drm_lock_release(struct drm_lock_data *, int);
+
+#if IS_ENABLED(CONFIG_DRM_LEGACY)
static int drm_lock_block_signals(struct drm_device *, struct drm_lock *,
struct drm_file *);
static void drm_lock_unblock_signals(struct drm_device *,
@@ -215,6 +217,7 @@ out1: spin_unlock(&master->lock.spinlock
out0: mutex_lock(&drm_global_mutex);
return error;
}
+#endif
/*
* Try to acquire the lock. Whether or not we acquire it, guarantee
@@ -260,6 +263,7 @@ drm_legacy_idlelock_release(struct drm_l
spin_unlock(&lock_data->spinlock);
}
+#if IS_ENABLED(CONFIG_DRM_LEGACY)
/*
* Release the lock and free it on closing of a drm file.
*/
@@ -296,6 +300,7 @@ drm_legacy_lock_release(struct drm_devic
out: spin_unlock(&lock_data->spinlock);
}
+#endif
/*
* Try to acquire the lock. Return true if successful, false if not.
@@ -353,6 +358,7 @@ drm_lock_release(struct drm_lock_data *l
DRM_SPIN_WAKEUP_ONE(&lock_data->lock_queue, &lock_data->spinlock);
}
+#if IS_ENABLED(CONFIG_DRM_LEGACY)
/*
* Block signals for a process that holds a drm lock.
*
@@ -375,3 +381,4 @@ drm_lock_unblock_signals(struct drm_devi
struct drm_lock *lock_request __unused, struct drm_file *file __unused)
{
}
+#endif
