Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:18:37 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem_shrinker.c
Log Message:
Use kpause for schedule_timeout_killable/fatal_signal_pending.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_shrinker.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/i915/i915_gem_shrinker.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_shrinker.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_shrinker.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_shrinker.c:1.3 Mon Aug 27 07:18:28 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_shrinker.c Mon Aug 27 07:18:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_shrinker.c,v 1.3 2018/08/27 07:18:28 riastradh Exp $ */
+/* $NetBSD: i915_gem_shrinker.c,v 1.4 2018/08/27 07:18:37 riastradh Exp $ */
/*
* Copyright © 2008-2015 Intel Corporation
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_shrinker.c,v 1.3 2018/08/27 07:18:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_shrinker.c,v 1.4 2018/08/27 07:18:37 riastradh Exp $");
#include <linux/oom.h>
#include <linux/shmem_fs.h>
@@ -289,9 +289,15 @@ i915_gem_shrinker_oom(struct notifier_bl
bool unlock;
while (!i915_gem_shrinker_lock(dev, &unlock) && --timeout) {
+#ifdef __NetBSD__
+ int error = kpause("i915shnk", true, 1, NULL);
+ if (error == EINTR || error == ERESTART)
+ return NOTIFY_DONE;
+#else
schedule_timeout_killable(1);
if (fatal_signal_pending(current))
return NOTIFY_DONE;
+#endif
}
if (timeout == 0) {
pr_err("Unable to purge GPU memory due lock contention.\n");
