From patchwork Wed Mar 3 05:34:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Owain Ainsworth X-Patchwork-Id: 83262 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o235Z6CH021544 for ; Wed, 3 Mar 2010 05:35:41 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F1F389E84E; Tue, 2 Mar 2010 21:35:04 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-bw0-f219.google.com (mail-bw0-f219.google.com [209.85.218.219]) by gabe.freedesktop.org (Postfix) with ESMTP id 4C55A9E7EB for ; Tue, 2 Mar 2010 21:35:01 -0800 (PST) Received: by bwz19 with SMTP id 19so1023121bwz.6 for ; Tue, 02 Mar 2010 21:34:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:received:from:to:cc:subject :date:message-id:x-mailer; bh=/Nj07YZaq+J/gJEpurQIGodGPqwjeY9V+ZfWjlPjlew=; b=s/F90a3RlDjJO3EapnSIhZSW0UbRxvgcNdEg1yGL+VLAbQB3XTDog9PVDEGM1B4oSL 68gUwQFBB31PUbDggrLDalN8MnxhPnphKVkhPTsIIK3G89iqEmE+ln4GzLVposW5Gv9p SLKTrqEVrWFYceCVn5peNNA4DJZ8E7Gzc55kw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=bgJkjAUju57I8WRkLqaqjHUIsyN06zLf1+3E3fIUHeU9mjX9YS41M+0bTfKxmJPWjE ATQOq69SZ+ushe4GisbJoM3PaDULLGDV6XT1/MYWAAorwiZ0swZ2hvafROo8qFZ9yp53 XEOb6C9ViG7Z3coIeBfxnMDa+e8YaDgikMHcU= Received: by 10.204.33.147 with SMTP id h19mr569457bkd.210.1267594499238; Tue, 02 Mar 2010 21:34:59 -0800 (PST) Received: from stephanie.nicotinebsd.org (ns1.nicotinebsd.org [93.97.176.184]) by mx.google.com with ESMTPS id p13sm7263268bkp.21.2010.03.02.21.34.57 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 02 Mar 2010 21:34:58 -0800 (PST) Received: from localhost (1000@localhost [IPv6:::1]) by stephanie.nicotinebsd.org (OpenSMTPD) with ESMTP id 1267594496.XQl2GkzAyEbEj2jU; Wed, 3 Mar 2010 05:34:56 +0000 (GMT) From: "Owain G. Ainsworth" To: intel-gfx@lists.freedesktop.org Date: Wed, 3 Mar 2010 05:34:29 +0000 Message-Id: <1267594469-15049-1-git-send-email-oga@openbsd.org> X-Mailer: git-send-email 1.6.5.7 Cc: "Owain G. Ainsworth" Subject: [Intel-gfx] [PATCH] drm/i915: remove an unnecessary wait_request() 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@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 03 Mar 2010 05:35:42 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index fba37e9..e52a277 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2227,11 +2227,6 @@ i915_gem_evict_something(struct drm_device *dev, int min_size) seqno = i915_add_request(dev, NULL, obj->write_domain); if (seqno == 0) return -ENOMEM; - - ret = i915_wait_request(dev, seqno); - if (ret) - return ret; - continue; } }