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@xxxxxxx>
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@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
