drm/i915: kill a no longer necessary BUG_ON
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 2 Feb 2010 21:54:18 +0000 (22:54 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Wed, 8 Sep 2010 09:23:37 +0000 (10:23 +0100)
i915_gem_object_move_to_active can handle zero seqno for us now.
And not emitting a request is not fatal here - we'll try to emit
a new one if we have to wait for some rendering to complete.

In case this assumption ever gets accidentally broken, there's already
a BUG_ON to catch it in i915_do_wait_request.

So just silently ignore ENOMEM here instead of screwing up the whole
drm.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/i915_gem.c

index 46394f735a81d7dc9ad53466cdd2cff5de5556b7..a54b8132f891f25f589141f53a91337c48c2515b 100644 (file)
@@ -3827,7 +3827,6 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
         * wait on when trying to clear up gtt space).
         */
        seqno = i915_add_request(dev, file_priv, ring);
-       BUG_ON(seqno == 0);
        for (i = 0; i < args->buffer_count; i++) {
                struct drm_gem_object *obj = object_list[i];
                obj_priv = to_intel_bo(obj);