[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Fix >40-bit paddr error ...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/22597c532248
branches:  trunk
changeset: 329193:22597c532248
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed May 14 13:53:41 2014 +0000

description:
Fix >40-bit paddr error branch in i915_gem_object_get_pages_gtt.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_gem.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (21 lines):

diff -r 4afac6da9666 -r 22597c532248 sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Wed May 14 13:46:19 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Wed May 14 13:53:41 2014 +0000
@@ -2215,6 +2215,7 @@
                        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 @@
            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