From patchwork Thu Jul 1 01:24:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Torvalds X-Patchwork-Id: 108998 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o611P1sd028057 for ; Thu, 1 Jul 2010 01:25:36 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AF9069E923 for ; Wed, 30 Jun 2010 18:25:00 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org [140.211.169.13]) by gabe.freedesktop.org (Postfix) with ESMTP id 694E39E7CA for ; Wed, 30 Jun 2010 18:24:49 -0700 (PDT) Received: from mail-gw0-f49.google.com (mail-gw0-f49.google.com [74.125.83.49]) (authenticated bits=0) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id o611O9f4021526 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=FAIL) for ; Wed, 30 Jun 2010 18:24:18 -0700 Received: by gwj16 with SMTP id 16so46496gwj.36 for ; Wed, 30 Jun 2010 18:24:04 -0700 (PDT) MIME-Version: 1.0 Received: by 10.90.10.21 with SMTP id 21mr7561995agj.106.1277947444515; Wed, 30 Jun 2010 18:24:04 -0700 (PDT) Received: by 10.151.48.19 with HTTP; Wed, 30 Jun 2010 18:24:04 -0700 (PDT) In-Reply-To: References: <1264605932-8540-1-git-send-email-chris@chris-wilson.co.uk> <89k77n$ms73l9@fmsmga001.fm.intel.com> <89khjo$fr177d@orsmga002.jf.intel.com> Date: Wed, 30 Jun 2010 18:24:04 -0700 Message-ID: From: Linus Torvalds To: Chris Wilson X-Spam-Status: No, hits=-4.647 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED, PATCH_SUBJECT_OSDL X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Cc: earny@net4u.de, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, "A. Boulan" , michael@reinelt.co.at, Hugh Dickins , Pekka Enberg , A Rojas , KOSAKI Motohiro , rientjes@google.com, Vefa Bicakci , Roman Jarosz , stable@kernel.org Subject: Re: [Intel-gfx] [PATCH] drm/i915: Selectively enable self-reclaim 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: , Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@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]); Thu, 01 Jul 2010 01:25:36 +0000 (UTC) X-MIME-Autoconverted: from quoted-printable to 8bit by demeter.kernel.org id o611P1sd028057 diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 9ded3da..ec8ed6b 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2239,7 +2239,7 @@ i915_gem_object_get_pages(struct drm_gem_object *obj, mapping = inode->i_mapping; for (i = 0; i < page_count; i++) { page = read_cache_page_gfp(mapping, i, - mapping_gfp_mask (mapping) | + GFP_HIGHMEM | __GFP_COLD | gfpmask); if (IS_ERR(page))