[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 dctx->obj may still be n...

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

details:   https://anonhg.NetBSD.org/src/rev/553a938f589f
branches:  trunk
changeset: 330933:553a938f589f
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Jul 25 12:53:30 2014 +0000

description:
dctx->obj may still be null here!

diffstat:

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

diffs (13 lines):

diff -r d33ec6f7f47c -r 553a938f589f sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.c    Fri Jul 25 12:48:34 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.c    Fri Jul 25 12:53:30 2014 +0000
@@ -456,7 +456,8 @@
                ring->last_context = NULL;
        }
 
-       i915_gem_object_ggtt_unpin(dctx->obj);
+       if (dctx->obj)
+               i915_gem_object_ggtt_unpin(dctx->obj);
        i915_gem_context_unreference(dctx);
 }