From patchwork Wed May 7 05:21:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 4125581 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 74FD69F23C for ; Wed, 7 May 2014 05:21:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 510AC20259 for ; Wed, 7 May 2014 05:21:45 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 58CDC2018A for ; Wed, 7 May 2014 05:21:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6603B6EC25; Tue, 6 May 2014 22:21:43 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 5D7116EC1C for ; Tue, 6 May 2014 22:21:41 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by azsmga101.ch.intel.com with ESMTP; 06 May 2014 22:21:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="4.97,1001,1389772800"; d="scan'208"; a="527541091" Received: from unknown (HELO ironside.intel.com) ([10.255.12.78]) by fmsmga001.fm.intel.com with ESMTP; 06 May 2014 22:21:40 -0700 From: Ben Widawsky To: Intel GFX Date: Tue, 6 May 2014 22:21:32 -0700 Message-Id: <1399440098-17378-3-git-send-email-benjamin.widawsky@intel.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1399440098-17378-1-git-send-email-benjamin.widawsky@intel.com> References: <1399440098-17378-1-git-send-email-benjamin.widawsky@intel.com> Cc: Ben Widawsky , Ben Widawsky Subject: [Intel-gfx] [PATCH 3/9] drm/i915: WARN on unexpected return from drm_mm X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We only actually want to retry if the failure mode was not enough space, and so we'll evict. This will help us realize quickly in case we missed a change in the common drm code. NOTE: A similar check is already in place for the GEN7 PPGTT code. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_gem.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 2a07fa1..b6965a2 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3233,6 +3233,9 @@ i915_gem_find_vm_space(struct i915_address_space *vm, DRM_MM_SEARCH_DEFAULT, DRM_MM_CREATE_DEFAULT); if (ret) { + if (WARN_ON(ret != -ENOSPC)) + return ret; + ret = i915_gem_evict_something(vm->dev, vm, size, align, color, flags); if (ret == 0)