From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:48668 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751822AbdGYEja (ORCPT ); Tue, 25 Jul 2017 00:39:30 -0400 Subject: Patch "drm/atomic: Add missing drm_atomic_state_clear to atomic_remove_fb" has been added to the 4.12-stable tree To: maarten.lankhorst@linux.intel.com, daniel.vetter@ffwll.ch, gregkh@linuxfoundation.org Cc: , From: Date: Mon, 24 Jul 2017 21:39:23 -0700 Message-ID: <150095756314276@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled drm/atomic: Add missing drm_atomic_state_clear to atomic_remove_fb to the 4.12-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: drm-atomic-add-missing-drm_atomic_state_clear-to-atomic_remove_fb.patch and it can be found in the queue-4.12 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 4086d90cffb8f48400d51fbab575fe50458512e3 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Thu, 29 Jun 2017 13:59:54 +0200 Subject: drm/atomic: Add missing drm_atomic_state_clear to atomic_remove_fb From: Maarten Lankhorst commit 4086d90cffb8f48400d51fbab575fe50458512e3 upstream. 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 Link: http://patchwork.freedesktop.org/patch/msgid/20170629115954.26029-1-maarten.lankhorst@linux.intel.com Reviewed-by: Daniel Vetter Fixes: db8f6403e88a ("drm: Convert drm_framebuffer_remove to atomic, v4.") Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/drm_framebuffer.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/gpu/drm/drm_framebuffer.c +++ b/drivers/gpu/drm/drm_framebuffer.c @@ -832,6 +832,7 @@ unlock: drm_atomic_clean_old_fb(dev, plane_mask, ret); if (ret == -EDEADLK) { + drm_atomic_state_clear(state); drm_modeset_backoff(&ctx); goto retry; } Patches currently in stable-queue which might be from maarten.lankhorst@linux.intel.com are queue-4.12/drm-i915-make-dp-mst-connector-info-work.patch queue-4.12/drm-atomic-add-missing-drm_atomic_state_clear-to-atomic_remove_fb.patch