OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1fcdaa7
)
drm/i915: Treat an error from i915_vma_instance() as unlikely
author
Chris Wilson
<chris@chris-wilson.co.uk>
Thu, 19 Jan 2017 19:26:57 +0000
(19:26 +0000)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Sat, 21 Jan 2017 10:32:21 +0000
(10:32 +0000)
When pinning into the global GTT, an error from creating the VMA is
unlikely, so mark it so.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link:
http://patchwork.freedesktop.org/patch/msgid/20170119192659.31789-4-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
drivers/gpu/drm/i915/i915_gem.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_gem.c
b/drivers/gpu/drm/i915/i915_gem.c
index
145dc83
..
a07b627
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_gem.c
+++ b/
drivers/gpu/drm/i915/i915_gem.c
@@
-3688,7
+3688,7
@@
i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj,
lockdep_assert_held(&obj->base.dev->struct_mutex);
vma = i915_vma_instance(obj, vm, view);
- if (
IS_ERR(vma
))
+ if (
unlikely(IS_ERR(vma)
))
return vma;
if (i915_vma_misplaced(vma, size, alignment, flags)) {