diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-01-10 11:15:22 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-01-10 13:28:45 +0000 |
| commit | 7f9e20ef0f4689d3a47068cd4c32b40982ad9941 (patch) | |
| tree | 705b04ee8b43dd99baa45e49fd62b5c68d111e73 /drivers/gpu/drm/i915/i915_gpu_error.c | |
| parent | d78a600f703bd04e93009b00e81ffe5ad666729a (diff) | |
| download | linux-stable-7f9e20ef0f4689d3a47068cd4c32b40982ad9941.tar.gz linux-stable-7f9e20ef0f4689d3a47068cd4c32b40982ad9941.tar.bz2 linux-stable-7f9e20ef0f4689d3a47068cd4c32b40982ad9941.zip | |
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: 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
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gpu_error.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gpu_error.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 5533a741abeb..5eaf586c4d48 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -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; |