From: Daniel Vetter <daniel@ffwll.ch>
To: Pan Bian <bianpan2016@163.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@linux.ie>,
linux-kernel@vger.kernel.org, Sean Paul <seanpaul@chromium.org>,
dri-devel@lists.freedesktop.org
Subject: Re: [PATCH 1/1] drm/atomic: put state on error path
Date: Tue, 19 Jan 2021 14:36:05 +0100 [thread overview]
Message-ID: <YAbgRbyeN2QUWKJr@phenom.ffwll.local> (raw)
In-Reply-To: <20210119121127.84127-1-bianpan2016@163.com>
On Tue, Jan 19, 2021 at 04:11:27AM -0800, Pan Bian wrote:
> Put the state before returning error code.
>
> Fixes: 44596b8c4750 ("drm/atomic: Unify conflicting encoder handling.")
>
> Signed-off-by: Pan Bian <bianpan2016@163.com>
Nice catch, patch merged to drm-misc-fixes with cc: stable.
-Daniel
> ---
> drivers/gpu/drm/drm_atomic_helper.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index ba1507036f26..4a8cbec832bc 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -3021,7 +3021,7 @@ int drm_atomic_helper_set_config(struct drm_mode_set *set,
>
> ret = handle_conflicting_encoders(state, true);
> if (ret)
> - return ret;
> + goto fail;
>
> ret = drm_atomic_commit(state);
>
> --
> 2.17.1
>
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel@ffwll.ch>
To: Pan Bian <bianpan2016@163.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Sean Paul <seanpaul@chromium.org>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/1] drm/atomic: put state on error path
Date: Tue, 19 Jan 2021 14:36:05 +0100 [thread overview]
Message-ID: <YAbgRbyeN2QUWKJr@phenom.ffwll.local> (raw)
In-Reply-To: <20210119121127.84127-1-bianpan2016@163.com>
On Tue, Jan 19, 2021 at 04:11:27AM -0800, Pan Bian wrote:
> Put the state before returning error code.
>
> Fixes: 44596b8c4750 ("drm/atomic: Unify conflicting encoder handling.")
>
> Signed-off-by: Pan Bian <bianpan2016@163.com>
Nice catch, patch merged to drm-misc-fixes with cc: stable.
-Daniel
> ---
> drivers/gpu/drm/drm_atomic_helper.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index ba1507036f26..4a8cbec832bc 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -3021,7 +3021,7 @@ int drm_atomic_helper_set_config(struct drm_mode_set *set,
>
> ret = handle_conflicting_encoders(state, true);
> if (ret)
> - return ret;
> + goto fail;
>
> ret = drm_atomic_commit(state);
>
> --
> 2.17.1
>
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2021-01-19 13:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-19 12:11 [PATCH 1/1] drm/atomic: put state on error path Pan Bian
2021-01-19 13:36 ` Daniel Vetter [this message]
2021-01-19 13:36 ` Daniel Vetter
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=YAbgRbyeN2QUWKJr@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=airlied@linux.ie \
--cc=bianpan2016@163.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=seanpaul@chromium.org \
--cc=tzimmermann@suse.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.