Merge drm-upstream/drm-next into drm-intel-next-queued

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_gem_execbuffer.c

diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index fa18677cdb543eba5826459d305dab7042a646ea..d733c4d5a5002c047fed386a9531081a80373197 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -299,7 +299,7 @@ static int eb_create(struct i915_execbuffer *eb)
                         * as possible to perform the allocation and warn
                         * if it fails.
                         */
-                       flags = GFP_TEMPORARY;
+                       flags = GFP_KERNEL;
                        if (size > 1)
                                flags |= __GFP_NORETRY | __GFP_NOWARN;
 
@@ -1523,7 +1523,7 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb)
                urelocs = u64_to_user_ptr(eb->exec[i].relocs_ptr);
                size = nreloc * sizeof(*relocs);
 
-               relocs = kvmalloc_array(size, 1, GFP_TEMPORARY);
+               relocs = kvmalloc_array(size, 1, GFP_KERNEL);
                if (!relocs) {
                        kvfree(relocs);
                        err = -ENOMEM;
@@ -2085,7 +2085,7 @@ get_fence_array(struct drm_i915_gem_execbuffer2 *args,
                return ERR_PTR(-EFAULT);
 
        fences = kvmalloc_array(args->num_cliprects, sizeof(*fences),
-                               __GFP_NOWARN | GFP_TEMPORARY);
+                               __GFP_NOWARN | GFP_KERNEL);
        if (!fences)
                return ERR_PTR(-ENOMEM);
 
@@ -2472,9 +2472,9 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
 
        /* Copy in the exec list from userland */
        exec_list = kvmalloc_array(args->buffer_count, sizeof(*exec_list),
-                                  __GFP_NOWARN | GFP_TEMPORARY);
+                                  __GFP_NOWARN | GFP_KERNEL);
        exec2_list = kvmalloc_array(args->buffer_count + 1, sz,
-                                   __GFP_NOWARN | GFP_TEMPORARY);
+                                   __GFP_NOWARN | GFP_KERNEL);
        if (exec_list == NULL || exec2_list == NULL) {
                DRM_DEBUG("Failed to allocate exec list for %d buffers\n",
                          args->buffer_count);
@@ -2552,7 +2552,7 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data,
 
        /* Allocate an extra slot for use by the command parser */
        exec2_list = kvmalloc_array(args->buffer_count + 1, sz,
-                                   __GFP_NOWARN | GFP_TEMPORARY);
+                                   __GFP_NOWARN | GFP_KERNEL);
        if (exec2_list == NULL) {
                DRM_DEBUG("Failed to allocate exec list for %d buffers\n",
                          args->buffer_count);