drm/atmel-hlcdc: Handle drm_atomic_helper_swap_state failure

drm_atomic_helper_swap_state() will be changed to interruptible waiting
in the next few commits, so all drivers have to be changed to handling
failure.

Atmel tracks pending commits through dc->commit.pending, so it can
ignore the changes by setting stall = false. We never return failure in
this case, so make failure a BUG_ON.

Signed-off-by: Maarten Lankhorst <[email protected]>
Cc: Boris Brezillon <[email protected]>
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by: Sean Paul <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>

diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
index 516d9547d331a87cf406d990509b65102d710702..64f54dc7dd680acf44a44eecb28ad0321b3e21f7 100644 (file)
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
@@ -539,14 +539,13 @@ static int atmel_hlcdc_dc_atomic_commit(struct drm_device *dev,
                dc->commit.pending = true;
        spin_unlock(&dc->commit.wait.lock);
 
-       if (ret) {
-               kfree(commit);
-               goto error;
-       }
+       if (ret)
+               goto err_free;
 
-       /* Swap the state, this is the point of no return. */
-       drm_atomic_helper_swap_state(state, true);
+       /* We have our own synchronization through the commit lock. */
+       BUG_ON(drm_atomic_helper_swap_state(state, false) < 0);
 
+       /* Swap state succeeded, this is the point of no return. */
        drm_atomic_state_get(state);
        if (async)
                queue_work(dc->wq, &commit->work);
@@ -555,6 +554,8 @@ static int atmel_hlcdc_dc_atomic_commit(struct drm_device *dev,
 
        return 0;
 
+err_free:
+       kfree(commit);
 error:
        drm_atomic_helper_cleanup_planes(dev, state);
        return ret;