* [PATCH] drm: Fixup failure paths in drm_atomic_helper_set_config
@ 2017-03-29 17:41 Daniel Vetter
2017-03-29 18:35 ` Harry Wentland
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Vetter @ 2017-03-29 17:41 UTC (permalink / raw)
To: DRI Development; +Cc: Daniel Vetter, Intel Graphics Development, Daniel Vetter
I've screwed this up when removing the legacy backoff hack.
Fixes: 38b6441e4e75 ("drm/atomic-helper: Remove the backoff hack from set_config")
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: David Airlie <airlied@linux.ie>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/drm_atomic_helper.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 9dc67b52b905..d5915317e7d3 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -2294,10 +2294,11 @@ int drm_atomic_helper_set_config(struct drm_mode_set *set,
state->acquire_ctx = ctx;
ret = __drm_atomic_helper_set_config(set, state);
if (ret != 0)
- return ret;
+ goto fail;
ret = drm_atomic_commit(state);
+fail:
drm_atomic_state_put(state);
return ret;
}
--
2.11.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm: Fixup failure paths in drm_atomic_helper_set_config
2017-03-29 17:41 [PATCH] drm: Fixup failure paths in drm_atomic_helper_set_config Daniel Vetter
@ 2017-03-29 18:35 ` Harry Wentland
0 siblings, 0 replies; 2+ messages in thread
From: Harry Wentland @ 2017-03-29 18:35 UTC (permalink / raw)
To: Daniel Vetter, DRI Development; +Cc: Daniel Vetter, Intel Graphics Development
Of course. I totally missed that.
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Harry
On 2017-03-29 01:41 PM, Daniel Vetter wrote:
> I've screwed this up when removing the legacy backoff hack.
>
> Fixes: 38b6441e4e75 ("drm/atomic-helper: Remove the backoff hack from set_config")
> Cc: Harry Wentland <harry.wentland@amd.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Sean Paul <seanpaul@chromium.org>
> Cc: David Airlie <airlied@linux.ie>
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/drm_atomic_helper.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index 9dc67b52b905..d5915317e7d3 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -2294,10 +2294,11 @@ int drm_atomic_helper_set_config(struct drm_mode_set *set,
> state->acquire_ctx = ctx;
> ret = __drm_atomic_helper_set_config(set, state);
> if (ret != 0)
> - return ret;
> + goto fail;
>
> ret = drm_atomic_commit(state);
>
> +fail:
> drm_atomic_state_put(state);
> return ret;
> }
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-29 18:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-29 17:41 [PATCH] drm: Fixup failure paths in drm_atomic_helper_set_config Daniel Vetter
2017-03-29 18:35 ` Harry Wentland
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).