From patchwork Tue Aug 23 18:38:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 111168 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id AF0A5B6F64 for ; Wed, 24 Aug 2011 04:38:51 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Qvvry-0004r1-9i; Tue, 23 Aug 2011 18:38:38 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Qvvrx-0004qw-6Z for kernel-team@lists.ubuntu.com; Tue, 23 Aug 2011 18:38:37 +0000 Received: from c-69-254-227-224.hsd1.ks.comcast.net ([69.254.227.224] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1Qvvrw-0000aU-T9 for kernel-team@lists.ubuntu.com; Tue, 23 Aug 2011 18:38:37 +0000 From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH][Lucid SRU] drm/i915: Remove BUG_ON from i915_gem_evict_something Date: Tue, 23 Aug 2011 13:38:34 -0500 Message-Id: <1314124714-4854-1-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 1.7.4.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: https://bugs.launcpad.net/bugs/828550 According to Chris Wilson this BUG_ON was just paranoia and never something the kernel should explode on. He later removed it in upstream commit e39a01501b228e1be2037d5bddccae2a820af902. So let's just remove it. Signed-off-by: Seth Forshee Acked-by: Tim Gardner --- drivers/gpu/drm/i915/i915_gem_evict.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c index 9c1ec78..c4c6b6f 100644 --- a/drivers/gpu/drm/i915/i915_gem_evict.c +++ b/drivers/gpu/drm/i915/i915_gem_evict.c @@ -175,13 +175,6 @@ found: list_del_init(&obj_priv->evict_list); } - /* The just created free hole should be on the top of the free stack - * maintained by drm_mm, so this BUG_ON actually executes in O(1). - * Furthermore all accessed data has just recently been used, so it - * should be really fast, too. */ - BUG_ON(!drm_mm_search_free(&dev_priv->mm.gtt_space, min_size, - alignment, 0)); - return 0; }