Skip to content

Commit

Permalink
drm/i915: Add some sanity checks to unbound tracking
Browse files Browse the repository at this point in the history
A pair of universally true checks that just need to be put in the right
place depending on where in the patch sequence you go. Note that
i915_gem_object_put_pages_gtt() already gains the
BUG_ON(obj->gtt_space), but on reflection that needed to migrate to
put_pages().

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Chris Wilson authored and Daniel Vetter committed Aug 21, 2012
1 parent 6c085a7 commit c4670ad
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/gpu/drm/i915/i915_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -1378,6 +1378,8 @@ i915_gem_object_put_pages_gtt(struct drm_i915_gem_object *obj)
int page_count = obj->base.size / PAGE_SIZE;
int ret, i;

BUG_ON(obj->gtt_space);

if (obj->pages == NULL)
return 0;

Expand Down Expand Up @@ -2293,6 +2295,8 @@ i915_gem_object_unbind(struct drm_i915_gem_object *obj)
if (obj->pin_count)
return -EBUSY;

BUG_ON(obj->pages == NULL);

ret = i915_gem_object_finish_gpu(obj);
if (ret)
return ret;
Expand Down

0 comments on commit c4670ad

Please sign in to comment.