From: Daniel Vetter <daniel@ffwll.ch>
To: Lukas Wunner <lukas@wunner.de>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] drm: Fix return value of drm_framebuffer_init()
Date: Thu, 15 Oct 2015 15:34:49 +0200 [thread overview]
Message-ID: <20151015133449.GC13786@phenom.ffwll.local> (raw)
In-Reply-To: <20151015123150.A800E6E7AF@gabe.freedesktop.org>
On Thu, Oct 15, 2015 at 11:56:56AM +0200, Lukas Wunner wrote:
> In its original version, drm_framebuffer_init() returned a negative int
> if drm_mode_object_get() failed (f453ba046074, "DRM: add mode setting
> support").
>
> This was accidentally disabled by commit 4b096ac10da0 ("drm: revamp
> locking around fb creation/destruction"). Thus, drm_framebuffer_init()
> pretends success if drm_mode_object_get() failed.
>
> Reinstate the original behaviour. Also fix erroneous kernel-doc of
> drm_mode_object_get().
>
> Fixes: 4b096ac10da0 ("drm: revamp locking around fb creation/
> destruction")
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Lukas Wunner <lukas@wunner.de>
Nice catch. Applied to drm-misc, thanks.
-Daniel
> ---
> drivers/gpu/drm/drm_crtc.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> index e600a5f..7a9ae78 100644
> --- a/drivers/gpu/drm/drm_crtc.c
> +++ b/drivers/gpu/drm/drm_crtc.c
> @@ -306,8 +306,7 @@ static int drm_mode_object_get_reg(struct drm_device *dev,
> * reference counted modeset objects like framebuffers.
> *
> * Returns:
> - * New unique (relative to other objects in @dev) integer identifier for the
> - * object.
> + * Zero on success, error code on failure.
> */
> int drm_mode_object_get(struct drm_device *dev,
> struct drm_mode_object *obj, uint32_t obj_type)
> @@ -423,7 +422,7 @@ int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb,
> out:
> mutex_unlock(&dev->mode_config.fb_lock);
>
> - return 0;
> + return ret;
> }
> EXPORT_SYMBOL(drm_framebuffer_init);
>
> --
> 1.8.5.2 (Apple Git-48)
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
prev parent reply other threads:[~2015-10-15 13:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-15 9:56 [PATCH] drm: Fix return value of drm_framebuffer_init() Lukas Wunner
2015-10-15 13:34 ` 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=20151015133449.GC13786@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=lukas@wunner.de \
/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