Module Name: src
Committed By: riastradh
Date: Wed May 14 13:53:41 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem.c
Log Message:
Fix >40-bit paddr error branch in i915_gem_object_get_pages_gtt.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.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.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.4 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.4 Thu May 1 15:19:16 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Wed May 14 13:53:41 2014
@@ -2215,6 +2215,7 @@ i915_gem_object_get_pages_gtt(struct drm
DRM_ERROR("GEM physical address exceeds 40 bits"
": %"PRIxMAX"\n",
(uintmax_t)VM_PAGE_TO_PHYS(page));
+ error = -EIO;
goto fail2;
}
}
@@ -2236,7 +2237,8 @@ fail2: bus_dmamem_unwire_uvm_object(dev-
obj->base.size, obj->pages, (obj->base.size / PAGE_SIZE));
fail1: kfree(obj->pages);
obj->pages = NULL;
-fail0: return error;
+fail0: KASSERT(error);
+ return error;
}
#else
static int
