projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e7457a9
)
drm/i915: unbreak i915_gem_object_ggtt_unbind()
author
Dan Carpenter
<
[email protected]
>
Fri, 9 Aug 2013 09:44:11 +0000
(12:44 +0300)
committer
Daniel Vetter
<
[email protected]
>
Fri, 9 Aug 2013 10:04:53 +0000
(12:04 +0200)
There is an extra semi-colon here so we just leak and never unbind
anything.
This regression has been introduced in
commit
07fe0b12800d4752d729d4122c01f41f80a5ba5a
Author: Ben Widawsky <
[email protected]
>
Date: Wed Jul 31 17:00:10 2013 -0700
drm/i915: plumb VM into bind/unbind code
Cc: Ben Widawsky <
[email protected]
>
Signed-off-by: Dan Carpenter <
[email protected]
>
Signed-off-by: Daniel Vetter <
[email protected]
>
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 f5d389a2002492c4d83c08a70c36a5af9d206d6c..79cef3c9b1ad70444a3f8f198373e271e0a45cbc 100644
(file)
--- a/
drivers/gpu/drm/i915/i915_gem.c
+++ b/
drivers/gpu/drm/i915/i915_gem.c
@@
-2664,7
+2664,7
@@
i915_gem_object_ggtt_unbind(struct drm_i915_gem_object *obj)
struct drm_i915_private *dev_priv = obj->base.dev->dev_private;
struct i915_address_space *ggtt = &dev_priv->gtt.base;
- if (!i915_gem_obj_ggtt_bound(obj))
;
+ if (!i915_gem_obj_ggtt_bound(obj))
return 0;
if (obj->pin_count)