Commit 76cc0718 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/mediatek: 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: CK Hu <ck.hu@mediatek.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mediatek@lists.infradead.org
Link: http://patchwork.freedesktop.org/patch/msgid/20170711143314.2148-7-maarten.lankhorst@linux.intel.com


Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 0806f4ee

drivers/gpu/drm/mediatek/mtk_drm_drv.c

+6 −1
Original line number Diff line number Diff line
@@ -109,7 +109,12 @@ static int mtk_atomic_commit(struct drm_device *drm, 
	mutex_lock(&private->commit.lock);

	flush_work(&private->commit.work);



	drm_atomic_helper_swap_state(state, true);

	ret = drm_atomic_helper_swap_state(state, true);

	if (ret) {

		mutex_unlock(&private->commit.lock);

		drm_atomic_helper_cleanup_planes(drm, state);

		return ret;

	}



	drm_atomic_state_get(state);

	if (async)