Commit 7f9e20ef authored by Chris Wilson's avatar Chris Wilson

drm/i915: Guard error capture against unpinned vma

If we find an incompletely setup vma inside the request/engine at the
time of a hang, it may not have vma->pages initialised, so skip
capturing the object before we iterate over NULL.

Spotted by Matthew in preparation for using unpinned vma to track engine
state.
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190110111522.11023-1-chris@chris-wilson.co.uk
parent d78a600f
...@@ -1034,7 +1034,7 @@ i915_error_object_create(struct drm_i915_private *i915, ...@@ -1034,7 +1034,7 @@ i915_error_object_create(struct drm_i915_private *i915,
dma_addr_t dma; dma_addr_t dma;
int ret; int ret;
if (!vma) if (!vma || !vma->pages)
return NULL; return NULL;
num_pages = min_t(u64, vma->size, vma->obj->base.size) >> PAGE_SHIFT; num_pages = min_t(u64, vma->size, vma->obj->base.size) >> PAGE_SHIFT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment