From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: [PATCH 3/5] drm/i915: WARN on unexpected return from drm_mm Date: Sat, 3 May 2014 10:56:00 -0700 Message-ID: <1399139762-20728-4-git-send-email-benjamin.widawsky@intel.com> References: <1399139762-20728-1-git-send-email-benjamin.widawsky@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail.bwidawsk.net (bwidawsk.net [166.78.191.112]) by gabe.freedesktop.org (Postfix) with ESMTP id 0B6C86E6A6 for ; Sat, 3 May 2014 10:56:42 -0700 (PDT) In-Reply-To: <1399139762-20728-1-git-send-email-benjamin.widawsky@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel GFX Cc: Ben Widawsky , Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org 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 d03702ac..1f85ec5 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) -- 1.9.2