|
@@ -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);
|
|
|
}
|
|
|
|