projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8ae62dc
)
drm/i915: Suppress a WARN on reading an object back for a GPU hang
author
Chris Wilson
<chris@chris-wilson.co.uk>
Tue, 12 Aug 2014 19:05:50 +0000
(20:05 +0100)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Wed, 3 Sep 2014 08:54:26 +0000
(10:54 +0200)
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>
drivers/gpu/drm/i915/i915_gpu_error.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_gpu_error.c
b/drivers/gpu/drm/i915/i915_gpu_error.c
index 726e6b171505ed4b660c0fd77be022f37513a430..1e05414c64064151240af7fd338e1a98219f1d00 100644
(file)
--- 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 &&