From: Daniel Vetter <daniel@ffwll.ch>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 2/2] drm/i915: Avoid requesting a zero-sized stolen object
Date: Mon, 10 Mar 2014 09:18:37 +0100 [thread overview]
Message-ID: <20140310081837.GC1328@phenom.ffwll.local> (raw)
In-Reply-To: <1394438822-17709-2-git-send-email-chris@chris-wilson.co.uk>
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@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>
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@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
prev parent reply other threads:[~2014-03-10 8:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-10 8:07 [PATCH 1/2] drm/i915: Prevent use-after-free of inherited framebuffer Chris Wilson
2014-03-10 8:07 ` [PATCH 2/2] drm/i915: Avoid requesting a zero-sized stolen object Chris Wilson
2014-03-10 8:18 ` Daniel Vetter [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140310081837.GC1328@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox