diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-11-15 11:32:29 +0000 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-11-30 23:43:32 +0100 |
| commit | 8040513870399f1cb032cb8bc805df5042fedcdf (patch) | |
| tree | 67faf50ec34df524ae864c14f219ec6c31c47d96 /drivers/gpu/drm/i915/intel_overlay.c | |
| parent | ebc052e0c65f84f68626e388ffa1704b3a190ef7 (diff) | |
| download | op-kernel-dev-8040513870399f1cb032cb8bc805df5042fedcdf.zip op-kernel-dev-8040513870399f1cb032cb8bc805df5042fedcdf.tar.gz | |
drm/i915: Allocate overlay registers 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_overlay.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_overlay.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index d7bc817..fabe0ac 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c @@ -1333,8 +1333,10 @@ void intel_setup_overlay(struct drm_device *dev) overlay->dev = dev; - reg_bo = i915_gem_alloc_object(dev, PAGE_SIZE); - if (!reg_bo) + reg_bo = i915_gem_object_create_stolen(dev, PAGE_SIZE); + if (reg_bo == NULL) + reg_bo = i915_gem_alloc_object(dev, PAGE_SIZE); + if (reg_bo == NULL) goto out_free; overlay->reg_bo = reg_bo; |
