Skip to contentSkip to conversation

Patch "drm/atomic: Add missing drm_atomic_state_clear to atomic_remove_fb" has been added to the 4.12-stable tree

PATCH [email protected] 1 participant 1 message Jul 25, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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 <[email protected]> know about it.

Quoted 1 line

From 4086d90cffb8f48400d51fbab575fe50458512e3 Mon Sep 17 00:00:00 2001

From: Maarten Lankhorst <[email protected]>
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 <[email protected]>

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.

Fixes db8f6403e88a ("drm: Convert drm_framebuffer_remove to atomic, v4.")
---
 drivers/gpu/drm/drm_framebuffer.c |    1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/drm_framebuffer.c +1 -0
@@ -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 [email protected] 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