diff options
| author | Chris Wilson | 2014-03-10 09:07:02 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-03-10 09:18:15 +0100 |
| commit | ff2652ea46fe8bcd78d8d74148bb8f9624f90936 (patch) | |
| tree | 4408f4ba9be20bfd107e1182a534dafb2fdd4036 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Prevent use-after-free of inherited framebuffer (diff) | |
| download | kernel-qcow2-linux-ff2652ea46fe8bcd78d8d74148bb8f9624f90936.tar.gz kernel-qcow2-linux-ff2652ea46fe8bcd78d8d74148bb8f9624f90936.tar.xz kernel-qcow2-linux-ff2652ea46fe8bcd78d8d74148bb8f9624f90936.zip | |
drm/i915: Avoid requesting a zero-sized stolen object
The stolen allocator objects loudly if the caller requests a zero-sized
object. This is a useful verbose check as in most cases the request
should have been pruned much early. Here we just want to silently return
before attempting the allocation.
Regression from
commit 484b41dd70a9fbea894632d8926bbb93f05021c7
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Fri Mar 7 08:57:55 2014 -0800
drm/i915: remove early fb allocation dependency on CONFIG_FB v2
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75963
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 1f180a45e082..500435fd2aea 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2076,6 +2076,9 @@ static bool intel_alloc_plane_obj(struct intel_crtc *crtc, struct drm_mode_fb_cmd2 mode_cmd = { 0 }; u32 base = plane_config->base; + if (plane_config->size == 0) + return false; + obj = i915_gem_object_create_stolen_for_preallocated(dev, base, base, plane_config->size); if (!obj) |