2012-08-27 12:02:51

by Sedat Dilek

Subject: [PATCH] drm/i915: Remove __GFP_NO_KSWAPD

When I pulled-in today's drm-intel-next into linux-next (next-20120824)
I saw this build-breakage:

drivers/gpu/drm/i915/i915_gem.c: In function 'i915_gem_object_get_pages_gtt':
drivers/gpu/drm/i915/i915_gem.c:1778:40: error: '__GFP_NO_KSWAPD' undeclared (first use in this function)
drivers/gpu/drm/i915/i915_gem.c:1778:40: note: each undeclared identifier is reported only once for each function it appears in

This is caused by commit ba099ef165f8 ("mm: remove __GFP_NO_KSWAPD")
and commit b6beae2c2014 ("mm: remove __GFP_NO_KSWAPD fixes") in
linux-next (next-20120824).

Fix this by removing __GFP_NO_KSWAPD from drm/i915 driver.

Signed-off-by: Sedat Dilek <[email protected]>
---
drivers/gpu/drm/i915/i915_gem.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 61612b3..e16f37b 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1775,7 +1775,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
/* Fail silently without starting the shrinker */
mapping = obj->base.filp->f_path.dentry->d_inode->i_mapping;
gfp = mapping_gfp_mask(mapping);
- gfp |= __GFP_NORETRY | __GFP_NOWARN | __GFP_NO_KSWAPD;
+ gfp |= __GFP_NORETRY | __GFP_NOWARN;
gfp &= ~(__GFP_IO | __GFP_WAIT);
for (i = 0; i < page_count; i++) {
page = shmem_read_mapping_page_gfp(mapping, i, gfp);
@@ -1788,7 +1788,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
* our own buffer, now let the real VM do its job and
* go down in flames if truly OOM.
*/
- gfp &= ~(__GFP_NORETRY | __GFP_NOWARN | __GFP_NO_KSWAPD);
+ gfp &= ~(__GFP_NORETRY | __GFP_NOWARN);
gfp |= __GFP_IO | __GFP_WAIT;

i915_gem_shrink_all(dev_priv);
@@ -1796,7 +1796,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
if (IS_ERR(page))
goto err_pages;

- gfp |= __GFP_NORETRY | __GFP_NOWARN | __GFP_NO_KSWAPD;
+ gfp |= __GFP_NORETRY | __GFP_NOWARN;
gfp &= ~(__GFP_IO | __GFP_WAIT);
}

--
1.7.9.5

2012-08-27 15:11:20

by Daniel Vetter

Subject: Re: [PATCH] drm/i915: Remove __GFP_NO_KSWAPD

On Mon, Aug 27, 2012 at 02:02:37PM +0200, Sedat Dilek wrote:
> When I pulled-in today's drm-intel-next into linux-next (next-20120824)
> I saw this build-breakage:
>
> drivers/gpu/drm/i915/i915_gem.c: In function 'i915_gem_object_get_pages_gtt':
> drivers/gpu/drm/i915/i915_gem.c:1778:40: error: '__GFP_NO_KSWAPD' undeclared (first use in this function)
> drivers/gpu/drm/i915/i915_gem.c:1778:40: note: each undeclared identifier is reported only once for each function it appears in
>
> This is caused by commit ba099ef165f8 ("mm: remove __GFP_NO_KSWAPD")
> and commit b6beae2c2014 ("mm: remove __GFP_NO_KSWAPD fixes") in
> linux-next (next-20120824).
>
> Fix this by removing __GFP_NO_KSWAPD from drm/i915 driver.
>
> Signed-off-by: Sedat Dilek <[email protected]>

Queued for -next, thanks for the patch.
-Daniel
--
Daniel Vetter
Mail: [email protected]
Mobile: +41 (0)79 365 57 48