Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 18:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Convert BUG_ON(pin_count) from an impossible condition

Browse Source 
Also spotted by Dan Carpenter.

obj->pin_count is unsigned so the BUG_ON(obj->pin_count<0) will never
trigger.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2010-10-29 10:41:23 +01:00
parent bbe2e11a4b
commit 7465378fd7
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/drm/i915/i915_gem.c
View File

@ -4128,12 +4128,7 @@ i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment,
return ret; return ret;
} }
obj_priv->pin_count++; if (obj_priv->pin_count++ == 0) {
/* If the object is not active and not pending a flush,
* remove it from the inactive list
*/
if (obj_priv->pin_count == 1) {
i915_gem_info_add_pin(dev_priv, obj, mappable); i915_gem_info_add_pin(dev_priv, obj, mappable);
if (!obj_priv->active) if (!obj_priv->active)
list_move_tail(&obj_priv->mm_list, list_move_tail(&obj_priv->mm_list,
@ -4153,15 +4148,10 @@ i915_gem_object_unpin(struct drm_gem_object *obj)
struct drm_i915_gem_object *obj_priv = to_intel_bo(obj); struct drm_i915_gem_object *obj_priv = to_intel_bo(obj);
WARN_ON(i915_verify_lists(dev)); WARN_ON(i915_verify_lists(dev));
obj_priv->pin_count--; BUG_ON(obj_priv->pin_count == 0);
BUG_ON(obj_priv->pin_count < 0);
BUG_ON(obj_priv->gtt_space == NULL); BUG_ON(obj_priv->gtt_space == NULL);
/* If the object is no longer pinned, and is if (--obj_priv->pin_count == 0) {
* neither active nor being flushed, then stick it on
* the inactive list
*/
if (obj_priv->pin_count == 0) {
if (!obj_priv->active) if (!obj_priv->active)
list_move_tail(&obj_priv->mm_list, list_move_tail(&obj_priv->mm_list,
&dev_priv->mm.inactive_list); &dev_priv->mm.inactive_list);