Commit 8572636e authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/nouveau: 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: Ben Skeggs <bskeggs@redhat.com>
Cc: nouveau@lists.freedesktop.org
Link: http://patchwork.freedesktop.org/patch/msgid/20170711143314.2148-4-maarten.lankhorst@linux.intel.com


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

drivers/gpu/drm/nouveau/nv50_display.c

+4 −1
Original line number Diff line number Diff line
@@ -4123,6 +4123,10 @@ nv50_disp_atomic_commit(struct drm_device *dev, 
			goto err_cleanup;

	}



	ret = drm_atomic_helper_swap_state(state, true);

	if (ret)

		goto err_cleanup;



	for_each_plane_in_state(state, plane, plane_state, i) {

		struct nv50_wndw_atom *asyw = nv50_wndw_atom(plane_state);

		struct nv50_wndw *wndw = nv50_wndw(plane);
@@ -4136,7 +4140,6 @@ nv50_disp_atomic_commit(struct drm_device *dev, 
		}

	}



	drm_atomic_helper_swap_state(state, true);

	drm_atomic_state_get(state);



	if (nonblock)