Module Name: src
Committed By: snj
Date: Fri May 22 17:28:37 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [netbsd-7]: i915_gem_gtt.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #797):
sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c: revision 1.4
Fix kassert: npdp may be GEN8_LEGACY_PDPS exactly.
Tripped over by msaitoh, our first Broadwell user, apparently.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.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_gtt.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c:1.3.2.1
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c:1.3 Mon Jul 21 20:01:18 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c Fri May 22 17:28:37 2015
@@ -575,7 +575,7 @@ gen8_ppgtt_allocate_page_directories(str
ppgtt->u.gen8->npdp = npdp;
- KASSERT(nsegs < GEN8_LEGACY_PDPS);
+ KASSERT(nsegs <= GEN8_LEGACY_PDPS);
CTASSERT(GEN8_LEGACY_PDPS == __arraycount(ppgtt->u.gen8->pd_segs));
/* XXX errno NetBSD->Linux */
