diff options
| author | Daniel Vetter | 2014-04-09 14:33:47 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-04-09 14:33:47 +0200 |
| commit | 8cbf3202098f191f8b0a0606b2df0af047f21fe5 (patch) | |
| tree | 8e49e81e1879de78fcd6ac64041b9a72db06caec /drivers/gpu/drm/i915/i915_gem_gtt.c | |
| parent | drm/i915: Provide a bit more info when pipestat bits are wrong (diff) | |
| parent | DRM: armada: fix corruption while loading cursors (diff) | |
| download | kernel-qcow2-linux-8cbf3202098f191f8b0a0606b2df0af047f21fe5.tar.gz kernel-qcow2-linux-8cbf3202098f191f8b0a0606b2df0af047f21fe5.tar.xz kernel-qcow2-linux-8cbf3202098f191f8b0a0606b2df0af047f21fe5.zip | |
Merge remote-tracking branch 'airlied/drm-next' into HEAD
Backmerge drm-next after the big s/crtc->fb/crtc->primary->fb/
cocinelle patch to avoid endless amounts of conflict hilarity in my
-next queue for 3.16.
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.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index cb6401fe9637..0d514ff9b94c 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -1016,7 +1016,8 @@ alloc: &ppgtt->node, GEN6_PD_SIZE, GEN6_PD_ALIGN, 0, 0, dev_priv->gtt.base.total, - DRM_MM_SEARCH_DEFAULT); + DRM_MM_SEARCH_DEFAULT, + DRM_MM_CREATE_DEFAULT); if (ret == -ENOSPC && !retried) { ret = i915_gem_evict_something(dev, &dev_priv->gtt.base, GEN6_PD_SIZE, GEN6_PD_ALIGN, |