From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.9 05/34] drm/msm: Grab a vblank reference when waiting for commit_done Date: Wed, 12 Dec 2018 23:31:31 -0500 Message-ID: <20181213043200.76295-5-sashal@kernel.org> References: <20181213043200.76295-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181213043200.76295-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, Sean Paul , freedreno@lists.freedesktop.org List-Id: linux-arm-msm@vger.kernel.org RnJvbTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+CgpbIFVwc3RyZWFtIGNvbW1p dCAzYjcxMmU0M2UzODc2YjQyYjM4MzIxZWNmNzkwYTFmNWZlNTljODM0IF0KClNpbWlsYXIgdG8g dGhlIGF0b21pYyBoZWxwZXJzLCB3ZSBzaG91bGQgZW5hYmxlIHZibGFuayB3aGlsZSB3ZSdyZQp3 YWl0aW5nIGZvciB0aGUgY29tbWl0IHRvIGZpbmlzaC4gRFBVIG5lZWRzIHRoaXMsIE1EUDUgc2Vl bXMgdG8gd29yawpmaW5lIHdpdGhvdXQgaXQuCgpSZXZpZXdlZC1ieTogQWJoaW5hdiBLdW1hciA8 YWJoaW5hdmtAY29kZWF1cm9yYS5vcmc+ClNpZ25lZC1vZmYtYnk6IFNlYW4gUGF1bCA8c2VhbnBh dWxAY2hyb21pdW0ub3JnPgpTaWduZWQtb2ZmLWJ5OiBSb2IgQ2xhcmsgPHJvYmRjbGFya0BnbWFp bC5jb20+ClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmluIDxzYXNoYWxAa2VybmVsLm9yZz4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9hdG9taWMuYyB8IDUgKysrKysKIDEgZmlsZSBjaGFu Z2VkLCA1IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL21z bV9hdG9taWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2F0b21pYy5jCmluZGV4IDczYmFl MzgyZWFjMy4uNWM1OGE5OGY2N2MwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbXNtL21z bV9hdG9taWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9hdG9taWMuYwpAQCAtOTgs NyArOTgsMTIgQEAgc3RhdGljIHZvaWQgbXNtX2F0b21pY193YWl0X2Zvcl9jb21taXRfZG9uZShz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlpZiAob2xkX3N0YXRlLT5sZWdhY3lfY3Vyc29yX3Vw ZGF0ZSkKIAkJCWNvbnRpbnVlOwogCisJCWlmIChkcm1fY3J0Y192YmxhbmtfZ2V0KGNydGMpKQor CQkJY29udGludWU7CisKIAkJa21zLT5mdW5jcy0+d2FpdF9mb3JfY3J0Y19jb21taXRfZG9uZShr bXMsIGNydGMpOworCisJCWRybV9jcnRjX3ZibGFua19wdXQoY3J0Yyk7CiAJfQogfQogCi0tIAoy LjE5LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRy aS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= 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 2C224C65BAE for ; Thu, 13 Dec 2018 04:41:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E604020849 for ; Thu, 13 Dec 2018 04:41:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544676068; bh=ttrfBu99qtgWpRc0a/8Ui+TleXiT555AvdMlbmPBL0c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Wt5zvnb60A0iQIreXK3HOW0UHwHM8VSp3wk3YIecgsTlhRARIg0r86odYojPcMlYF 0Ps1viRm6JuHZ2IET20zh3UjBW4Kry9Fg+m6y7nKGXxydH+7VkWkIY0wzigtmqeh0t avGlIaDwX5AFYO5vJXSMcc0zO0xo1Byg8+r/fNtw= DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E604020849 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 S1728346AbeLMElG (ORCPT ); Wed, 12 Dec 2018 23:41:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:45096 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728940AbeLMEcI (ORCPT ); Wed, 12 Dec 2018 23:32:08 -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 92AFF20873; Thu, 13 Dec 2018 04:32:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544675528; bh=ttrfBu99qtgWpRc0a/8Ui+TleXiT555AvdMlbmPBL0c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZhlZlkDGxJ9UoDkHUjM63u6x38moGCmBa4QyGuJ2ewEBn5qa2go/+00/wbMS1rgAt E5k/zXMzRnoITOwO0CcKYdulZt1SsvqKkio7S6GZhWqa4USKvqRB5a/jzgB24guLUr 1smfet6qBII5xo4Ig+qvQa6P3n+uirVDSeJTv/jU= 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.9 05/34] drm/msm: Grab a vblank reference when waiting for commit_done Date: Wed, 12 Dec 2018 23:31:31 -0500 Message-Id: <20181213043200.76295-5-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181213043200.76295-1-sashal@kernel.org> References: <20181213043200.76295-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 73bae382eac3..5c58a98f67c0 100644 --- a/drivers/gpu/drm/msm/msm_atomic.c +++ b/drivers/gpu/drm/msm/msm_atomic.c @@ -98,7 +98,12 @@ static void msm_atomic_wait_for_commit_done(struct drm_device *dev, if (old_state->legacy_cursor_update) 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