Upon returning valid error code on atomic_ioctl failure, changes have been done to goto error/out in cases of error instead of returining to accommodate returning the failure codes. As part of this change complete_signaling() will be called as part of cleanup. Check if the fences are initialized/prepared before completing.
Signed-off-by: Arun R Murthy <[email protected]> Reviewed-by: Suraj Kandpal <[email protected]> --- drivers/gpu/drm/drm_atomic_uapi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index c228c9aed75acdb09a80df5dad54440a5c182254..bcd12b6eac4f497d2edb8581d9fb0fd54cbef827 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -1569,7 +1569,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, struct drm_modeset_acquire_ctx ctx; struct drm_out_fence_state *fence_state; int ret = 0; - unsigned int i, j, num_fences; + unsigned int i, j, num_fences = 0; bool async_flip = false; /* disallow for drivers not supporting atomic: */ @@ -1725,7 +1725,8 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, } out: - complete_signaling(dev, state, fence_state, num_fences, !ret); + if (num_fences) + complete_signaling(dev, state, fence_state, num_fences, !ret); if (ret == -EDEADLK) { drm_atomic_state_clear(state); -- 2.25.1
