mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm: Fixup failure paths in drm_atomic_helper_set_config

Browse source 
I've screwed this up when removing the legacy backoff hack.

Fixes: 38b6441e4e ("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
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170329174136.10330-1-daniel.vetter@ffwll.ch
This commit is contained in:
Daniel Vetter 2017-03-29 19:41:36 +02:00
parent b33b02707b
commit 1fa4da043a
1 changed files with 2 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/gpu/drm/drm_atomic_helper.c
View file

@ -2293,10 +2293,11 @@ int drm_atomic_helper_set_config(struct drm_mode_set *set,
state->acquire_ctx = ctx; state->acquire_ctx = ctx;
ret = __drm_atomic_helper_set_config(set, state); ret = __drm_atomic_helper_set_config(set, state);
if (ret != 0) if (ret != 0)
return ret; goto fail;
ret = drm_atomic_commit(state); ret = drm_atomic_commit(state);
fail:
drm_atomic_state_put(state); drm_atomic_state_put(state);
return ret; return ret;
} }