diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-11-15 11:32:28 +0000 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-11-30 23:41:52 +0100 |
| commit | ebc052e0c65f84f68626e388ffa1704b3a190ef7 (patch) | |
| tree | ae160c79a8b9d7eb542e56f76acb58fd7a187590 /drivers/gpu/drm/i915/intel_ringbuffer.c | |
| parent | 0ffb0ff283cca16f72caf29c44496d83b0c291fb (diff) | |
| download | olio-linux-3.10-ebc052e0c65f84f68626e388ffa1704b3a190ef7.tar.xz olio-linux-3.10-ebc052e0c65f84f68626e388ffa1704b3a190ef7.zip | |
drm/i915: Allocate ringbuffers from stolen memory
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Acked-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index bc7cf7c6310..36e1e13ae94 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -1113,7 +1113,11 @@ static int intel_init_ring_buffer(struct drm_device *dev, return ret; } - obj = i915_gem_alloc_object(dev, ring->size); + obj = NULL; + if (!HAS_LLC(dev)) + obj = i915_gem_object_create_stolen(dev, ring->size); + if (obj == NULL) + obj = i915_gem_alloc_object(dev, ring->size); if (obj == NULL) { DRM_ERROR("Failed to allocate ringbuffer\n"); ret = -ENOMEM; |