OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ebc052e
)
drm/i915: Allocate overlay registers from stolen memory
author
Chris Wilson
<chris@chris-wilson.co.uk>
Thu, 15 Nov 2012 11:32:29 +0000
(11:32 +0000)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Fri, 30 Nov 2012 22:43:32 +0000
(23:43 +0100)
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>
drivers/gpu/drm/i915/intel_overlay.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/intel_overlay.c
b/drivers/gpu/drm/i915/intel_overlay.c
index
d7bc817
..
fabe0ac
100644
(file)
--- 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;