[Intel-gfx] [PATCH 2/2] drm/i915: Avoid requesting a zero-sized stolen object

[Daniel Vetter]

On Mon, Mar 10, 2014 at 08:07:02AM +0000, Chris Wilson wrote:
> 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 at 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 at chris-wilson.co.uk>

Both patches merged, thanks for the quick fixup.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_display.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index c3864d1bc62f..961fc06b9ed1 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)
> -- 
> 1.9.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch