projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5cef07e
)
drm/i915: Free stolen node on failed preallocation
author
Ben Widawsky
<ben@bwidawsk.net>
Wed, 17 Jul 2013 19:19:02 +0000
(12:19 -0700)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Wed, 17 Jul 2013 20:24:51 +0000
(22:24 +0200)
The odds of this happening are *extremely* unlikely.
Reported-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_gem_stolen.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_gem_stolen.c
b/drivers/gpu/drm/i915/i915_gem_stolen.c
index
90a6183
..
cb527e7
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/
drivers/gpu/drm/i915/i915_gem_stolen.c
@@
-402,7
+402,7
@@
i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,
&obj->gtt_space);
if (ret) {
DRM_DEBUG_KMS("failed to allocate stolen GTT space\n");
- goto
unref
_out;
+ goto
err
_out;
}
}
@@
-413,7
+413,8
@@
i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,
return obj;
-unref_out:
+err_out:
+ drm_mm_put_block(stolen);
drm_gem_object_unreference(&obj->base);
return NULL;
}