From patchwork Fri Feb 14 13:01:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3652541 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2EDB3BF13A for ; Fri, 14 Feb 2014 13:02:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 99C782022A for ; Fri, 14 Feb 2014 13:02:20 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id ED81D2018B for ; Fri, 14 Feb 2014 13:02:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 539B910588C; Fri, 14 Feb 2014 05:02:11 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f178.google.com (mail-ea0-f178.google.com [209.85.215.178]) by gabe.freedesktop.org (Postfix) with ESMTP id 6DCEEFB52B for ; Fri, 14 Feb 2014 05:01:52 -0800 (PST) Received: by mail-ea0-f178.google.com with SMTP id a15so5707910eae.23 for ; Fri, 14 Feb 2014 05:01:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4gcyqCiS5gBpUuMcs+qknG5MEBJxymnHlEDOshWbjvU=; b=Whd0dlaHLCfoYJjmvDX3ORt+lMHdj/rLoxBJUZrGSQ+hYWcEbbn+q7rjpzqGGMH41h 9piruVcxaCwG7Pq//Di/ko8vCzGuVBRpU56gHKPB2gQwBIUfFtKs21LFuFRQA8JFXAFS EWMwpuOR75IMyxH66YkzveSgqnvzN35U2OpVY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4gcyqCiS5gBpUuMcs+qknG5MEBJxymnHlEDOshWbjvU=; b=ND5I1l1pgBfDcCk/I3XVUqIw7FWcy/NvCXwWoXh6dQ890RG6oTnLKbpM+0Om4d127t 88fDnPFZHBYXGLY7dxZNKCBXyIMvH04XemIC5BCfnJ1KFXDzVlOaOg2c8zSuSBdiOS2a q84psa+CeQvEnT9Ozm1NdlKIXTtVH8IsIx6E1mSJyXe8oczSjGl4m//EyDMLLzK7x4S5 xhcF6W+bJqrlaEuTKk0SAdIAc3qpFhEnj0VfNZnAB5G8gTkcClbyCHo6X1/J7lPn7TxZ 0XcmpgotuAnmq9GHfLwMBkgT9SSG66CCZta3tyPTw+0Mj/y4STHwZNQ4lmKlnj3p5p7Y JvQA== X-Gm-Message-State: ALoCoQktmw+EY2Z7PWfHM1xzKorhnTjamlyf/7ebH4xcxUxlGpLhXcCTJjg6IGLDFY1SNOvcsKuH X-Received: by 10.15.24.136 with SMTP id j8mr8854997eeu.1.1392382910502; Fri, 14 Feb 2014 05:01:50 -0800 (PST) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id j41sm19560682eeg.10.2014.02.14.05.01.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Feb 2014 05:01:49 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development Date: Fri, 14 Feb 2014 14:01:18 +0100 Message-Id: <1392382881-19073-9-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1392382881-19073-1-git-send-email-daniel.vetter@ffwll.ch> References: <1392382881-19073-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Ben Widawsky Subject: [Intel-gfx] [PATCH 08/11] drm/i915: Allow blocking in the PDE alloc when running low on gtt space X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 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@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 There's no need not to, really. Split out from Chris vma-bind rework. Cc: Chris Wilson Cc: Ben Widawsky Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 154e1ad8bfab..af3bd9b6fa27 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -868,7 +868,7 @@ alloc: if (ret == -ENOSPC && !retried) { ret = i915_gem_evict_something(dev, &dev_priv->gtt.base, GEN6_PD_SIZE, GEN6_PD_ALIGN, - I915_CACHE_NONE, PIN_NONBLOCK); + I915_CACHE_NONE, 0); if (ret) return ret;