Module Name: src
Committed By: riastradh
Date: Fri Jul 25 12:53:30 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem_context.c
Log Message:
dctx->obj may still be null here!
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.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_context.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.c:1.5 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.c:1.5 Wed Jul 16 20:56:24 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.c Fri Jul 25 12:53:30 2014
@@ -456,7 +456,8 @@ void i915_gem_context_fini(struct drm_de
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);
}
