From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57110C65BAE for ; Thu, 13 Dec 2018 04:31:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 12B5A20879 for ; Thu, 13 Dec 2018 04:31:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544675470; bh=pDoKBI+UmvumvDVNdKXjj8mcqMeyPpSgmwHb2gk5qss=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=U7BgLUJDycraGYexoABUj6VGtXUW693ajWG8EK/Zo2OQ9+/4fSQYy6eVGl1W1KUM2 H8FkWl29d8MLIkpUeRREp0ge1z0d34T1t/qPaEfdYsnt4uUDjRAXVK6EAKFXWn62+K bFrWx2jUQ4e6eKe76eb5LmJQiyX0iJp5WoTcybUI= DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 12B5A20879 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728634AbeLMEbI (ORCPT ); Wed, 12 Dec 2018 23:31:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:43882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728593AbeLMEbD (ORCPT ); Wed, 12 Dec 2018 23:31:03 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 806DB20672; Thu, 13 Dec 2018 04:31:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544675463; bh=pDoKBI+UmvumvDVNdKXjj8mcqMeyPpSgmwHb2gk5qss=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DUdDATgbm8LitWOSe3sTuq9nBkLA74ozXsFbHTmI3kGTLRfro0pYvVOPqtadaQIce Qdp+pJgWoDcBaCemrVuPj3KWe89mXV0bzg+L4UDVavSh9/gkAH+R/nEj4qAirjLWgJ /ALjLjYjBiFwVr44wSQdseRzqgK932oyCtYEEcv0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sean Paul , Rob Clark , Sasha Levin , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.14 06/41] drm/msm: Grab a vblank reference when waiting for commit_done Date: Wed, 12 Dec 2018 23:30:19 -0500 Message-Id: <20181213043054.75891-6-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181213043054.75891-1-sashal@kernel.org> References: <20181213043054.75891-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sean Paul [ Upstream commit 3b712e43e3876b42b38321ecf790a1f5fe59c834 ] Similar to the atomic helpers, we should enable vblank while we're waiting for the commit to finish. DPU needs this, MDP5 seems to work fine without it. Reviewed-by: Abhinav Kumar Signed-off-by: Sean Paul Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/msm_atomic.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c index 025d454163b0..8f77047a226d 100644 --- a/drivers/gpu/drm/msm/msm_atomic.c +++ b/drivers/gpu/drm/msm/msm_atomic.c @@ -93,7 +93,12 @@ static void msm_atomic_wait_for_commit_done(struct drm_device *dev, if (!new_crtc_state->active) continue; + if (drm_crtc_vblank_get(crtc)) + continue; + kms->funcs->wait_for_crtc_commit_done(kms, crtc); + + drm_crtc_vblank_put(crtc); } } -- 2.19.1