Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:13:31 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_mman.c
Log Message:
i915: Use i915_gem_object_has_pages, not a simple null test.
The pages pointer may be ERR_PTR(-EWHATEVER) instead of null.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.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/gem/i915_gem_mman.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.19 src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.20
--- src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.19 Sun Dec 19 12:10:06 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c Sun Dec 19 12:13:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_mman.c,v 1.19 2021/12/19 12:10:06 riastradh Exp $ */
+/* $NetBSD: i915_gem_mman.c,v 1.20 2021/12/19 12:13:31 riastradh Exp $ */
/*
* SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.19 2021/12/19 12:10:06 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.20 2021/12/19 12:13:31 riastradh Exp $");
#include <linux/anon_inodes.h>
#include <linux/mman.h>
@@ -717,7 +717,7 @@ void i915_gem_object_release_mmap_offset
struct vm_page *vm_page;
unsigned i;
- if (obj->mm.pages == NULL)
+ if (!i915_gem_object_has_pages(obj))
return;
for (i = 0; i < obj->base.size >> PAGE_SHIFT; i++) {
page = obj->mm.pages->sgl->sg_pgs[i];
