diff options
| author | Chris Wilson | 2017-06-09 13:03:48 +0200 |
|---|---|---|
| committer | Chris Wilson | 2017-06-14 11:53:37 +0200 |
| commit | 0f6ab55d7ab6847e9b799022ed3b5511c756e512 (patch) | |
| tree | 607f7e5da015d5d4ff6f509eda6a86dae3e14b41 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: Remove __GFP_NORETRY from our buffer allocator (diff) | |
| download | kernel-qcow2-linux-0f6ab55d7ab6847e9b799022ed3b5511c756e512.tar.gz kernel-qcow2-linux-0f6ab55d7ab6847e9b799022ed3b5511c756e512.tar.xz kernel-qcow2-linux-0f6ab55d7ab6847e9b799022ed3b5511c756e512.zip | |
drm/i915: Only restrict noreclaim in the early shrink passes
In our first pass, we do not want to use reclaim at all as we want to
solely reap the i915 buffer caches (its purgeable pages). But we don't
mind it initiates IO or pulls via the FS (but it shouldn't anyway as we
say no to reclaim!). Just drop the GFP_IO constraint for simplicity.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170609110350.1767-3-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index b22145a876c5..31cbe78171a9 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2367,8 +2367,7 @@ rebuild_st: * Fail silently without starting the shrinker */ mapping = obj->base.filp->f_mapping; - noreclaim = mapping_gfp_constraint(mapping, - ~(__GFP_IO | __GFP_RECLAIM)); + noreclaim = mapping_gfp_constraint(mapping, ~__GFP_RECLAIM); noreclaim |= __GFP_NORETRY | __GFP_NOWARN; sg = st->sgl; |