Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp433815imu; Wed, 12 Dec 2018 20:47:31 -0800 (PST) X-Google-Smtp-Source: AFSGD/VK0Pbq8Fj/rqhLlhGxg1FKYeqytmQC6eGTOsfmGG8fckZo/c+6f4OybFJ/rnYvjKJzjCWL X-Received: by 2002:a62:5c1:: with SMTP id 184mr22557287pff.165.1544676451173; Wed, 12 Dec 2018 20:47:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544676451; cv=none; d=google.com; s=arc-20160816; b=Cs8hSVDPUC+/UN0mIfHnPj0KycK9c4SkoIVYi9yYWI4Fcq0izwtaDSvkqTp8OWaxmR PJka6+YF4budTuc/v93V71RR5UbbSeCPRLYiQ1CAVjgQ8wfbB6uy471SBpXqbgXDP6Cp ZkvpV3ynUltuavMtFFVmz+HHEEJ3yeJvTrlXSFFYFxH5WRt31uMFLcO/8ELxqsZMBWKn 372BZWb8296fjdDHbsNaHmsw42nTHdfgpcrCOO7Dfk53lO0xDU6lCbmQN7hhB22bf9nx UcFXYL9H7eVU2ntnmEeBeEXYeg4dO6yfs+8ZphrV1MGJtk+s+DgBTe4M1XMZ6i4CRQSa Vgng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=58shN1qTvnKN4S6XgHmhVxccv1m+6x8nDRAvxowL2xs=; b=Ffi6hyAKbCC6iPgSCEPDKPdszRYJbjOKuqh/E1/4GTBWsCA3Ub7hKCA6ssPqmWRnn1 McsIgjlWG7dbtqkVPObt+xNh6h7sio4mNyB8MAhp5HBUEYzXEnBInX3nL4n6hhGh7CgA 2yiBFZ6SY3orsV7EcUdacIT+clC0vB2DcgCPUHp6Qce5TG4K+TZ2NvYaeevoHZIASTTY UfnzxwWzyGKCM7sAKy+3wBmWT0dAS/6zYHxMDDVa3lt6tHE6EJSsRMjphErtgOTNQrB+ LfmgWgthkFr+B9MOWhwFZTb83RhX0AlObptoUEccOMOgYhPwiCS+9FBtYp34Ek7ft/D0 9sgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DUdDATgb; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u27si707528pfa.103.2018.12.12.20.47.16; Wed, 12 Dec 2018 20:47:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DUdDATgb; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728628AbeLMEbH (ORCPT + 99 others); Wed, 12 Dec 2018 23:31:07 -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