diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-11-15 11:32:27 +0000 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-11-30 23:38:46 +0100 |
| commit | 0ffb0ff283cca16f72caf29c44496d83b0c291fb (patch) | |
| tree | 7bb4881f2bbd975441ac3e89d94cd316984ef869 /drivers/gpu/drm/i915/intel_fb.c | |
| parent | 0104fdbb84d7adb0e377ed05bf75eba97b007544 (diff) | |
| download | linux-0ffb0ff283cca16f72caf29c44496d83b0c291fb.tar.bz2 | |
drm/i915: Allocate fbcon 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_fb.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_fb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c index 7b30b5c2c4ee..b7773e548911 100644 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c @@ -83,7 +83,9 @@ static int intelfb_create(struct intel_fbdev *ifbdev, size = mode_cmd.pitches[0] * mode_cmd.height; size = ALIGN(size, PAGE_SIZE); - obj = i915_gem_alloc_object(dev, size); + obj = i915_gem_object_create_stolen(dev, size); + if (obj == NULL) + obj = i915_gem_alloc_object(dev, size); if (!obj) { DRM_ERROR("failed to allocate framebuffer\n"); ret = -ENOMEM; |