Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933262AbcCHQxh (ORCPT ); Tue, 8 Mar 2016 11:53:37 -0500 Received: from ring0.de ([5.45.101.7]:33632 "EHLO ring0.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933098AbcCHQuI (ORCPT ); Tue, 8 Mar 2016 11:50:08 -0500 X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail * domains are different * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] From: Sebastian Reichel To: Sebastian Reichel , Tony Lindgren , Aaro Koskinen , Tomi Valkeinen Cc: Laurent Pinchart , David Airlie , linux-omap@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/23] drm: omapdrm: wait for pending operations before updating plane Date: Tue, 8 Mar 2016 17:39:38 +0100 Message-Id: <1457455195-1938-7-git-send-email-sre@kernel.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457455195-1938-1-git-send-email-sre@kernel.org> References: <1457455195-1938-1-git-send-email-sre@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 875 Lines: 25 Updating the plane may interrupt ongoing display updates, so wait for any pending operations. Signed-off-By: Sebastian Reichel --- drivers/gpu/drm/omapdrm/omap_drv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index a3ff35f5f6cd..e142a4245766 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c @@ -95,6 +95,10 @@ static void omap_atomic_complete(struct omap_atomic_state_commit *commit) /* Apply the atomic update. */ dispc_runtime_get(); + dev_dbg(dev->dev, "omap_atomic_complete"); + + omap_atomic_wait_for_completion(dev, old_state); + drm_atomic_helper_commit_modeset_disables(dev, old_state); drm_atomic_helper_commit_planes(dev, old_state, false); drm_atomic_helper_commit_modeset_enables(dev, old_state); -- 2.7.0