[PATCH] Revert "drm/atomic: Fix memleak on ERESTARTSYS during non-blocking commits"

Marta Lofstedt marta.lofstedt at intel.com
Wed Jan 10 07:54:02 UTC 2018


This reverts commit a10195bbe7f4e6ba540083ba13126ef745116cae.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104566
---
 drivers/gpu/drm/drm_atomic_helper.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 4253f57227e3..ab4032167094 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -3421,15 +3421,6 @@ EXPORT_SYMBOL(drm_atomic_helper_crtc_duplicate_state);
 void __drm_atomic_helper_crtc_destroy_state(struct drm_crtc_state *state)
 {
 	if (state->commit) {
-		/*
-		 * In the event that a non-blocking commit returns
-		 * -ERESTARTSYS before the commit_tail work is queued, we will
-		 * have an extra reference to the commit object. Release it, if
-		 * the event has not been consumed by the worker.
-		 */
-		if (state->event)
-			drm_crtc_commit_put(state->commit);
-
 		kfree(state->commit->event);
 		state->commit->event = NULL;
 		drm_crtc_commit_put(state->commit);
-- 
2.11.0



More information about the Intel-gfx-trybot mailing list