Commit 424624ea authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/tegra: 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.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: linux-tegra@vger.kernel.org
Link: http://patchwork.freedesktop.org/patch/msgid/20170711143314.2148-9-maarten.lankhorst@linux.intel.com


Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 771f14c5

drivers/gpu/drm/tegra/drm.c

+6 −1
Original line number Diff line number Diff line
@@ -100,7 +100,12 @@ static int tegra_atomic_commit(struct drm_device *drm, 
	 * the software side now.

	 */



	drm_atomic_helper_swap_state(state, true);

	err = drm_atomic_helper_swap_state(state, true);

	if (err) {

		mutex_unlock(&tegra->commit.lock);

		drm_atomic_helper_cleanup_planes(drm, state);

		return err;

	}



	drm_atomic_state_get(state);

	if (nonblock)