diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-08-12 19:05:50 (GMT) |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-03 08:54:26 (GMT) |
| commit | 87a01e822db6e8b6a2898ddc7f116698247c7a4d (patch) | |
| tree | 5ae2c8db6e06637c621ee96846422265552a4eed /drivers/gpu/drm/i915/i915_gpu_error.c | |
| parent | 8ae62dc62b340edd0f6a5a2522f284234e82c0ec (diff) | |
| download | linux-87a01e822db6e8b6a2898ddc7f116698247c7a4d.tar.xz | |
drm/i915: Suppress a WARN on reading an object back for a GPU hang
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gpu_error.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gpu_error.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 726e6b1..1e05414 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -577,7 +577,10 @@ i915_error_object_create(struct drm_i915_private *dev_priv, if (dst == NULL) return NULL; - dst->gtt_offset = i915_gem_obj_offset(src, vm); + if (i915_gem_obj_bound(src, vm)) + dst->gtt_offset = i915_gem_obj_offset(src, vm); + else + dst->gtt_offset = -1; reloc_offset = dst->gtt_offset; use_ggtt = (src->cache_level == I915_CACHE_NONE && |