Module Name: src
Committed By: martin
Date: Tue Aug 1 16:00:57 UTC 2023
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/gem [netbsd-10]:
i915_gem_busy.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #291):
sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_busy.c: revision 1.4
i915: Avoid dereferencing null fence if resv has changed.
PR kern/57402
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.4.1 \
src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_busy.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_busy.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_busy.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_busy.c:1.3.4.1
--- src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_busy.c:1.3 Sun Dec 19 11:20:25 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_busy.c Tue Aug 1 16:00:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_busy.c,v 1.3 2021/12/19 11:20:25 riastradh Exp $ */
+/* $NetBSD: i915_gem_busy.c,v 1.3.4.1 2023/08/01 16:00:57 martin Exp $ */
/*
* SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_busy.c,v 1.3 2021/12/19 11:20:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_busy.c,v 1.3.4.1 2023/08/01 16:00:57 martin Exp $");
#include "gt/intel_engine.h"
@@ -130,6 +130,8 @@ retry:
struct dma_fence *fence =
rcu_dereference(list->shared[i]);
+ if (read_seqcount_retry(&obj->base.resv->seq, seq))
+ goto retry;
args->busy |= busy_check_reader(fence);
}
}
