From patchwork Tue Apr 19 20:46:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 718851 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3JJrcTM007673 for ; Tue, 19 Apr 2011 19:53:58 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8CF8B9EF33 for ; Tue, 19 Apr 2011 12:53:38 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wy0-f177.google.com (mail-wy0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 2E3809EEDE for ; Tue, 19 Apr 2011 12:51:58 -0700 (PDT) Received: by mail-wy0-f177.google.com with SMTP id 28so50785wyb.36 for ; Tue, 19 Apr 2011 12:51:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=xjkH35512NKuGk8Bvfxq4B9JoCplY/hTeF5FWEhfq8g=; b=N9DaMJu7SjGIK30+LfL0LlXKWMWRwQIaYIH2ulrLJivuYuTTiTdnUQ8TgUJN7AoW70 FtCfrqZcIddkCZ5J2o4yOKlFnYzpxbRi+T2S5LoRNsAklO67Bd76K5Nm0XgdY0NroBoK 4s/13Hk/vXfJTfWBi8g6BQokT/mxWl+jN/Tl4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=Gcys3MtuVt6NhrccJr/0RsZ0hU17dhwJ26ELCU1B/J/jQcKEkHoDDLOHl0W4Bbvi17 bq1hW9MyqFY1RyzmP2zNSyAPUXB6snJG7kpIN1PFSjd4Skg9/OFiVH+I+E7BVYSSu8LI 0rDw7rs56AoY1eJewMqlPEyPsSJ1umMMmeRRI= Received: by 10.216.174.65 with SMTP id w43mr75420wel.95.1303242717638; Tue, 19 Apr 2011 12:51:57 -0700 (PDT) Received: from localhost.localdomain (cable-static-216-94.intergga.ch [87.102.216.94]) by mx.google.com with ESMTPS id u9sm138493wbg.34.2011.04.19.12.51.56 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 19 Apr 2011 12:51:57 -0700 (PDT) From: Daniel Vetter To: intel-gfx@lists.freedesktop.org Date: Tue, 19 Apr 2011 22:46:02 +0200 Message-Id: <1303245964-3022-4-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1303245964-3022-1-git-send-email-daniel.vetter@ffwll.ch> References: <1303245964-3022-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 3/5] drm/i915: check gpu_write_list in move_to_flushing X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 19 Apr 2011 19:53:58 +0000 (UTC) The corresponding WARN_ON with opposite sign already exists in move_to_inactive, hence add it here for symmetry. I've actually hit this while hunting down bugs in various pipelined fencing patches. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_gem.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 5c900d3..f658f4f 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1749,6 +1749,7 @@ i915_gem_object_move_to_flushing(struct drm_i915_gem_object *obj) drm_i915_private_t *dev_priv = dev->dev_private; WARN_ON(!obj->active); + WARN_ON(list_empty(&obj->gpu_write_list)); list_move_tail(&obj->mm_list, &dev_priv->mm.flushing_list); i915_gem_object_move_off_active(obj);