From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.20 162/304] drm/msm: dpu: Only check flush register against pending flushes Date: Mon, 28 Jan 2019 10:41:19 -0500 Message-ID: <20190128154341.47195-162-sashal@kernel.org> References: <20190128154341.47195-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190128154341.47195-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Sasha Levin , linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Rob Clark , Sean Paul , freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: linux-arm-msm@vger.kernel.org RnJvbTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+CgpbIFVwc3RyZWFtIGNvbW1p dCA1Zjc5ZTAzYjFmN2MxYjJjZjAwMTljZTYzNjVmZTVkNTI2Mjk4MTNkIF0KClRoZXJlIGV4aXN0 cyBhIGNhc2Ugd2hlcmUgYSBmbHVzaCBvZiBhIHBsYW5lL2RtYSBtYXkgaGF2ZSBiZWVuIHRyaWdn ZXJlZAomIHN0YXJ0ZWQgZnJvbSBhbiBhc3luYyBjb21taXQuIElmIHRoYXQgcGxhbmUvZG1hIGlz IHN1YnNlcXVlbnRseSBkaXNhYmxlZApieSB0aGUgbmV4dCBjb21taXQsIHRoZSBmbHVzaCByZWdp c3RlciB3aWxsIGNvbnRpbnVlIHRvIGhvbGQgdGhlIGZsdXNoCmJpdCBmb3IgdGhlIGRpc2FibGVk IHBsYW5lLiBTaW5jZSB0aGUgYml0IHJlbWFpbnMgYWN0aXZlLApwZW5kaW5nX2tpY2tvZmZfY250 IHdpbGwgbmV2ZXIgZGVjcmVtZW50IGFuZCB3ZSdsbCBtaXNzIGZyYW1lX2RvbmUKZXZlbnRzLgoK VGhpcyBwYXRjaCBsaW1pdHMgdGhlIGNoZWNrIG9mIGZsdXNoX3JlZ2lzdGVyIHRvIGluY2x1ZGUg b25seSB0aG9zZSBiaXRzCndoaWNoIGhhdmUgYmVlbiB1cGRhdGVkIHdpdGggdGhlIGxhdGVzdCBj b21taXQuCgpDaGFuZ2VzIGluIHYyOgotIE5vbmUKClJldmlld2VkLWJ5OiBKZXlrdW1hciBTYW5r YXJhbiA8anNhbmthQGNvZGVhdXJvcmEub3JnPgpTaWduZWQtb2ZmLWJ5OiBTZWFuIFBhdWwgPHNl YW5wYXVsQGNocm9taXVtLm9yZz4KU2lnbmVkLW9mZi1ieTogUm9iIENsYXJrIDxyb2JkY2xhcmtA Z21haWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X2VuY29kZXJfcGh5c192aWQu YyB8IDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV9lbmNvZGVyX3Bo eXNfdmlkLmMgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVfZW5jb2Rlcl9waHlz X3ZpZC5jCmluZGV4IDg0ZGUzODVhOWY2Mi4uNjBmMTQ2ZjAyYjc3IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVfZW5jb2Rlcl9waHlzX3ZpZC5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV9lbmNvZGVyX3BoeXNfdmlkLmMKQEAgLTMz MSw3ICszMzEsNyBAQCBzdGF0aWMgdm9pZCBkcHVfZW5jb2Rlcl9waHlzX3ZpZF92YmxhbmtfaXJx KHZvaWQgKmFyZywgaW50IGlycV9pZHgpCiAJaWYgKGh3X2N0bCAmJiBod19jdGwtPm9wcy5nZXRf Zmx1c2hfcmVnaXN0ZXIpCiAJCWZsdXNoX3JlZ2lzdGVyID0gaHdfY3RsLT5vcHMuZ2V0X2ZsdXNo X3JlZ2lzdGVyKGh3X2N0bCk7CiAKLQlpZiAoZmx1c2hfcmVnaXN0ZXIgPT0gMCkKKwlpZiAoIShm bHVzaF9yZWdpc3RlciAmIGh3X2N0bC0+b3BzLmdldF9wZW5kaW5nX2ZsdXNoKGh3X2N0bCkpKQog CQluZXdfY250ID0gYXRvbWljX2FkZF91bmxlc3MoJnBoeXNfZW5jLT5wZW5kaW5nX2tpY2tvZmZf Y250LAogCQkJCS0xLCAwKTsKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKHBoeXNfZW5jLT5lbmNf c3BpbmxvY2ssIGxvY2tfZmxhZ3MpOwotLSAKMi4xOS4xCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpGcmVlZHJlbm8gbWFpbGluZyBsaXN0CkZyZWVkcmVu b0BsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9mcmVlZHJlbm8K 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.1 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 DF1DEC282CD for ; Mon, 28 Jan 2019 15:51:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B12B420880 for ; Mon, 28 Jan 2019 15:51:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690683; bh=rBYd8QwqJuIH4PFxXIQ9z0z9ePLMMEuwZSQ4X7Qml/4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aX+wzUPLW5kd4Vb79fkh4YiEZXDw/Hy0ap95GZOl6fm9kKsTqIsBSQpaeg6c9Lwza 0NmLgLUhmR0tW/bLx8yrBK0w832NcbR+ZXEvtnBsGBnYlTeVpleQB2JaC+j9nsB15E kEqIsELNVwm5LyPNVz/E9pHC5XunGoT7AuFAGno8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729078AbfA1PvW (ORCPT ); Mon, 28 Jan 2019 10:51:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:38014 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728438AbfA1PvU (ORCPT ); Mon, 28 Jan 2019 10:51:20 -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 7D90220880; Mon, 28 Jan 2019 15:51:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690679; bh=rBYd8QwqJuIH4PFxXIQ9z0z9ePLMMEuwZSQ4X7Qml/4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2sJJnqyeZmc4I8yeV4jIX0nnSDznqf1oo2lHWgntWb5NweExDIAbZAUBkrnATa4E6 /WV4buFjwiUROogf5sFgAxHfXGWckjZdDMjDk/MnI/jP72FrQqyeGd9btFYv71ywTV qDRM2WCBf+JenPADPHYTWr3Qj6vUu6uOu5gerNvg= 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.20 162/304] drm/msm: dpu: Only check flush register against pending flushes Date: Mon, 28 Jan 2019 10:41:19 -0500 Message-Id: <20190128154341.47195-162-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128154341.47195-1-sashal@kernel.org> References: <20190128154341.47195-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 5f79e03b1f7c1b2cf0019ce6365fe5d52629813d ] There exists a case where a flush of a plane/dma may have been triggered & started from an async commit. If that plane/dma is subsequently disabled by the next commit, the flush register will continue to hold the flush bit for the disabled plane. Since the bit remains active, pending_kickoff_cnt will never decrement and we'll miss frame_done events. This patch limits the check of flush_register to include only those bits which have been updated with the latest commit. Changes in v2: - None Reviewed-by: Jeykumar Sankaran Signed-off-by: Sean Paul Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c index 84de385a9f62..60f146f02b77 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c @@ -331,7 +331,7 @@ static void dpu_encoder_phys_vid_vblank_irq(void *arg, int irq_idx) if (hw_ctl && hw_ctl->ops.get_flush_register) flush_register = hw_ctl->ops.get_flush_register(hw_ctl); - if (flush_register == 0) + if (!(flush_register & hw_ctl->ops.get_pending_flush(hw_ctl))) new_cnt = atomic_add_unless(&phys_enc->pending_kickoff_cnt, -1, 0); spin_unlock_irqrestore(phys_enc->enc_spinlock, lock_flags); -- 2.19.1