Skip to contentSkip to conversation

drm/i915: unbreak i915_gem_object_ggtt_unbind()

PATCH In review Dan Carpenter 2 participants 2 messages Aug 9, 2013

Subsystems (3)
DRM drivers Intel i915 Kernel janitors
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 drm/i915: unbreak i915_gem_object_ggtt_unbind()

There is an extra semi-colon here so we just leak and never unbind anything.

Signed-off-by Dan Carpenter <[email protected]>
drivers/gpu/drm/i915/i915_gem.c +1 -1
index 735f43f..a582540 100644
@@ -2656,7 +2656,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)
#1 lore raw
Quoted 10 lines · Dan Carpenter

There is an extra semi-colon here so we just leak and never unbind anything.

Signed-off-by Dan Carpenter <[email protected]>
drivers/gpu/drm/i915/i915_gem.c +0 -0
index 735f43f..a582540 100644

drivers/gpu/drm/i915/i915_gem.c i915_gem_object_ggtt_unbind(struct drm_i915_gem_object *obj) · line 2659

Quoted 5 lines
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -2656,7 +2656,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))

Oops, thanks for spotting this. Applied to dinq.
-Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch