diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2017-03-22 22:34:47 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-03-23 09:30:20 +0000 |
| commit | 40149f00fb55263cf10066bafc8470d33b1ddcfc (patch) | |
| tree | 9844f83e7e44240515e2e30a0867ab6cb2069ae1 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued (diff) | |
| download | linux-dev-40149f00fb55263cf10066bafc8470d33b1ddcfc.tar.xz linux-dev-40149f00fb55263cf10066bafc8470d33b1ddcfc.zip | |
drm/i915: Actually pass the reclaim gfp_t along to shmemfs!
Words cannot describe the embarrassment at creating a new gfp_t relaim to
only prevent the oomkiller but allow direct|kswapd reclaim, and then not
use it in the shmem_read_mapping_page_gfp().
Fixes: 24f8e00a8a2e ("drm/i915: Prefer to report ENOMEM rather than incur the oom for gfx allocations")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170322223447.7493-1-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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 9d710bd8c6c9..2a32d7c120fc 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2343,7 +2343,7 @@ rebuild_st: reclaim = mapping_gfp_constraint(mapping, 0); reclaim |= __GFP_NORETRY; /* reclaim, but no oom */ - page = shmem_read_mapping_page_gfp(mapping, i, gfp); + page = shmem_read_mapping_page_gfp(mapping, i, reclaim); if (IS_ERR(page)) { ret = PTR_ERR(page); goto err_sg; |