Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:18:47 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem_shrinker.c
Log Message:
Use gemo_shm_uao rather than filp.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
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.4 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_shrinker.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_shrinker.c:1.4 Mon Aug 27 07:18:37 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_shrinker.c Mon Aug 27 07:18:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_shrinker.c,v 1.4 2018/08/27 07:18:37 riastradh Exp $ */
+/* $NetBSD: i915_gem_shrinker.c,v 1.5 2018/08/27 07:18:47 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.4 2018/08/27 07:18:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_shrinker.c,v 1.5 2018/08/27 07:18:47 riastradh Exp $");
#include <linux/oom.h>
#include <linux/shmem_fs.h>
@@ -317,7 +317,11 @@ i915_gem_shrinker_oom(struct notifier_bl
*/
unbound = bound = pinned = 0;
list_for_each_entry(obj, &dev_priv->mm.unbound_list, global_list) {
+#ifdef __NetBSD__
+ if (!obj->base.gemo_shm_uao)
+#else
if (!obj->base.filp) /* not backed by a freeable object */
+#endif
continue;
if (obj->pages_pin_count)
@@ -326,7 +330,11 @@ i915_gem_shrinker_oom(struct notifier_bl
unbound += obj->base.size;
}
list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) {
+#ifdef __NetBSD__
+ if (!obj->base.gemo_shm_uao)
+#else
if (!obj->base.filp)
+#endif
continue;
if (obj->pages_pin_count)
