diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-02-19 13:35:18 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-02-19 13:35:18 +1000 |
| commit | 84266fcb3af6ba9e215adf0c482914963579639c (patch) | |
| tree | 830dac899929af5370fb5373154588f3687718b5 /drivers/gpu/drm/i915/gem/selftests/huge_gem_object.c | |
| parent | f40ddce88593482919761f74910f42f4b84c004b (diff) | |
| parent | ac35d19fe871c81b9d78053d675095b597270304 (diff) | |
Merge branch 'drm-next' of git://anongit.freedesktop.org/git/drm/drmdrm-next-5.11-merged
Trial merge for Linus
Diffstat (limited to 'drivers/gpu/drm/i915/gem/selftests/huge_gem_object.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gem/selftests/huge_gem_object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_gem_object.c b/drivers/gpu/drm/i915/gem/selftests/huge_gem_object.c index a768ec61e966..2fb501a78a85 100644 --- a/drivers/gpu/drm/i915/gem/selftests/huge_gem_object.c +++ b/drivers/gpu/drm/i915/gem/selftests/huge_gem_object.c @@ -27,7 +27,7 @@ static void huge_free_pages(struct drm_i915_gem_object *obj, static int huge_get_pages(struct drm_i915_gem_object *obj) { -#define GFP (GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY) +#define GFP (GFP_KERNEL | __GFP_NOWARN | __GFP_RETRY_MAYFAIL) const unsigned long nreal = obj->scratch / PAGE_SIZE; const unsigned long npages = obj->base.size / PAGE_SIZE; struct scatterlist *sg, *src, *end; |