summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem_gtt.c
diff options
context:
space:
mode:
authorDaniel Vetter2014-02-14 14:01:18 +0100
committerDaniel Vetter2014-02-14 14:18:15 +0100
commitd47c3ea2bd372fb5d84191d8383185825320ad91 (patch)
tree32c8401e4bc7f2bd6beff76e026ef8d6678aeeca /drivers/gpu/drm/i915/i915_gem_gtt.c
parentdrm/i915: Don't allocate context pages as mappable (diff)
downloadkernel-qcow2-linux-d47c3ea2bd372fb5d84191d8383185825320ad91.tar.gz
kernel-qcow2-linux-d47c3ea2bd372fb5d84191d8383185825320ad91.tar.xz
kernel-qcow2-linux-d47c3ea2bd372fb5d84191d8383185825320ad91.zip
drm/i915: Allow blocking in the PDE alloc when running low on gtt space
There's no need not to, really. Split out from Chris vma-bind rework. Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Ben Widawsky <benjamin.widawsky@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_gtt.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem_gtt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 1dcd50541ae2..69a88d41a2a7 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -885,7 +885,7 @@ alloc:
if (ret == -ENOSPC && !retried) {
ret = i915_gem_evict_something(dev, &dev_priv->gtt.base,
GEN6_PD_SIZE, GEN6_PD_ALIGN,
- I915_CACHE_NONE, PIN_NONBLOCK);
+ I915_CACHE_NONE, 0);
if (ret)
return ret;