projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.12-rc2' into drm-intel-next
[linux-2.6-block.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_gem_stolen.c
diff --git
a/drivers/gpu/drm/i915/i915_gem_stolen.c
b/drivers/gpu/drm/i915/i915_gem_stolen.c
index e15a1d90037d7709b2f4c489074ef5779ac6c1a8..d284d892ed9491e8f2a618e22576673e06887f74 100644
(file)
--- a/
drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/
drivers/gpu/drm/i915/i915_gem_stolen.c
@@
-395,7
+395,7
@@
i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,
if (gtt_offset == I915_GTT_OFFSET_NONE)
return obj;
- vma = i915_gem_
vma_create
(obj, ggtt);
+ vma = i915_gem_
obj_lookup_or_create_vma
(obj, ggtt);
if (IS_ERR(vma)) {
ret = PTR_ERR(vma);
goto err_out;