Commit 0806f4ee authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/i915: 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>
Link: http://patchwork.freedesktop.org/patch/msgid/20170711143314.2148-6-maarten.lankhorst@linux.intel.com


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

drivers/gpu/drm/i915/intel_display.c

+9 −1
Original line number Diff line number Diff line
@@ -13271,7 +13271,15 @@ static int intel_atomic_commit(struct drm_device *dev, 
	if (INTEL_GEN(dev_priv) < 9)

		state->legacy_cursor_update = false;



	drm_atomic_helper_swap_state(state, true);

	ret = drm_atomic_helper_swap_state(state, true);

	if (ret) {

		i915_sw_fence_commit(&intel_state->commit_ready);



		mutex_lock(&dev->struct_mutex);

		drm_atomic_helper_cleanup_planes(dev, state);

		mutex_unlock(&dev->struct_mutex);

		return ret;

	}

	dev_priv->wm.distrust_bios_wm = false;

	intel_shared_dpll_swap_state(state);

	intel_atomic_track_fbs(state);