Skip to content

Commit

Permalink
drm/i915: Guard error capture against unpinned vma
Browse files Browse the repository at this point in the history
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: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190110111522.11023-1-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed Jan 10, 2019
1 parent d78a600 commit 7f9e20e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/i915_gpu_error.c
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,7 @@ i915_error_object_create(struct drm_i915_private *i915,
dma_addr_t dma;
int ret;

if (!vma)
if (!vma || !vma->pages)
return NULL;

num_pages = min_t(u64, vma->size, vma->obj->base.size) >> PAGE_SHIFT;
Expand Down

0 comments on commit 7f9e20e

Please sign in to comment.