From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750911AbdAaFhl (ORCPT ); Tue, 31 Jan 2017 00:37:41 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:59852 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750724AbdAaFha (ORCPT ); Tue, 31 Jan 2017 00:37:30 -0500 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, David Airlie Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lucas Stach , Daniel Vetter , Fabio Estevam Subject: [PATCH 4.9 11/66] drm/atomic: clear out fence when duplicating state Date: Tue, 31 Jan 2017 06:36:15 +0100 Message-Id: <20170131053603.609800112@linuxfoundation.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170131053603.098140622@linuxfoundation.org> References: <20170131053603.098140622@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lucas Stach [Fixed differently in 4.10] The fence needs to be cleared out, otherwise the following commit might wait on a stale fence from the previous commit. This was fixed as a side effect of 9626014258a5 (drm/fence: add in-fences support) in kernel 4.10. As this commit introduces new functionality and as such can not be applied to stable, this patch is the minimal fix for the kernel 4.9 stable series. Signed-off-by: Lucas Stach Reviewed-by: Daniel Vetter Tested-by: Fabio Estevam Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/drm_atomic_helper.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3115,6 +3115,8 @@ void __drm_atomic_helper_plane_duplicate if (state->fb) drm_framebuffer_reference(state->fb); + + state->fence = NULL; } EXPORT_SYMBOL(__drm_atomic_helper_plane_duplicate_state);