Commit 4086d90c authored Jun 29, 2017 by Maarten Lankhorst

drm/atomic: Add missing drm_atomic_state_clear to atomic_remove_fb

All atomic state should be cleared when drm_modeset_backoff() is
called, because it drops all locks and the state becomes invalid.

The call to drm_atomic_state_clear was missing in atomic_remove_fb,
so add the missing call there.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170629115954.26029-1-maarten.lankhorst@linux.intel.com

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Fixes: db8f6403 ("drm: Convert drm_framebuffer_remove to atomic, v4.")
Cc: stable@vger.kernel.org # v4.12-rc1+

parent 138b87fa

drivers/gpu/drm/drm_framebuffer.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -832,6 +832,7 @@ static int atomic_remove_fb(struct drm_framebuffer *fb)
		drm_atomic_clean_old_fb(dev, plane_mask, ret);

		if (ret == -EDEADLK) {
		drm_atomic_state_clear(state);
		drm_modeset_backoff(&ctx);
		goto retry;
		}