From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 7/9] drm/imx: notify drm core before sending event during crtc disable Date: Wed, 10 Jul 2019 11:02:57 -0400 Message-ID: <20190710150301.7129-7-sashal@kernel.org> References: <20190710150301.7129-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 612526E0F7 for ; Wed, 10 Jul 2019 15:03:15 +0000 (UTC) In-Reply-To: <20190710150301.7129-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: Robert Beckett , Daniel Vetter , dri-devel@lists.freedesktop.org, Sasha Levin List-Id: dri-devel@lists.freedesktop.org RnJvbTogUm9iZXJ0IEJlY2tldHQgPGJvYi5iZWNrZXR0QGNvbGxhYm9yYS5jb20+CgpbIFVwc3Ry ZWFtIGNvbW1pdCA3OGM2OGU4ZjVjZDI0YmQzMmJhNGNhMWNkZmIwYzMwY2YwNjQyNjg1IF0KCk5v dGlmeSBkcm0gY29yZSBiZWZvcmUgc2VuZGluZyBwZW5kaW5nIGV2ZW50cyBkdXJpbmcgY3J0YyBk aXNhYmxlLgpUaGlzIGZpeGVzIHRoZSBmaXJzdCBldmVudCBhZnRlciBkaXNhYmxlIGhhdmluZyBh biBvbGQgc3RhbGUgdGltZXN0YW1wCmJ5IGhhdmluZyBkcm1fY3J0Y192Ymxhbmtfb2ZmIHVwZGF0 ZSB0aGUgdGltZXN0YW1wIHRvIG5vdy4KClRoaXMgd2FzIHNlZW4gd2hpbGUgZGVidWdnaW5nIHdl c3RvbiBsb2cgbWVzc2FnZToKV2FybmluZzogY29tcHV0ZWQgcmVwYWludCBkZWxheSBpcyBpbnNh bmU6IC04MjEyIG1zZWMKClRoaXMgb2NjdXJyZWQgZHVlIHRvOgoxLiBkcml2ZXIgc3RhcnRzIHVw CjIuIGZiY29uIGNvbWVzIGFsb25nIGFuZCByZXN0b3JlcyBmYmRldiwgZW5hYmxpbmcgdmJsYW5r CjMuIHZibGFua19kaXNhYmxlX2ZuIGZpcmVzIHZpYSB0aW1lciBkaXNhYmxpbmcgdmJsYW5rLCBr ZWVwaW5nIHZibGFuawpzZXEgbnVtYmVyIGFuZCB0aW1lIHNldCBhdCBjdXJyZW50IHZhbHVlCihz b21lIHRpbWUgbGF0ZXIpCjQuIHdlc3RvbiBzdGFydHMgYW5kIGRvZXMgYSBtb2Rlc2V0CjUuIGF0 b21pYyBjb21taXQgZGlzYWJsZXMgY3J0YyB3aGlsZSBpdCBkb2VzIHRoZSBtb2Rlc2V0CjYuIGlw dV9jcnRjX2F0b21pY19kaXNhYmxlIHNlbmRzIHZibGFuayB3aXRoIG9sZCBzZXEgbnVtYmVyIGFu ZCB0aW1lCgpGaXhlczogYTQ3NDQ3ODY0MmQ1ICgiZHJtL2lteDogZml4IGNydGMgdmJsYW5rIHN0 YXRlIHJlZ3Jlc3Npb24iKQoKU2lnbmVkLW9mZi1ieTogUm9iZXJ0IEJlY2tldHQgPGJvYi5iZWNr ZXR0QGNvbGxhYm9yYS5jb20+ClJldmlld2VkLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0 dGVyQGZmd2xsLmNoPgpTaWduZWQtb2ZmLWJ5OiBQaGlsaXBwIFphYmVsIDxwLnphYmVsQHBlbmd1 dHJvbml4LmRlPgpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2lteC9pcHV2My1jcnRjLmMgfCA0ICsrLS0KIDEgZmlsZSBj aGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2lteC9pcHV2My1jcnRjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaW14L2lwdXYz LWNydGMuYwppbmRleCAxMWUyZGNkZDZiMTguLjFiNTg3MGU3YmFjYyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2lteC9pcHV2My1jcnRjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2lteC9p cHV2My1jcnRjLmMKQEAgLTk4LDE0ICs5OCwxNCBAQCBzdGF0aWMgdm9pZCBpcHVfY3J0Y19hdG9t aWNfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJaXB1X2RjX2Rpc2FibGUoaXB1KTsK IAlpcHVfcHJnX2Rpc2FibGUoaXB1KTsKIAorCWRybV9jcnRjX3ZibGFua19vZmYoY3J0Yyk7CisK IAlzcGluX2xvY2tfaXJxKCZjcnRjLT5kZXYtPmV2ZW50X2xvY2spOwogCWlmIChjcnRjLT5zdGF0 ZS0+ZXZlbnQpIHsKIAkJZHJtX2NydGNfc2VuZF92YmxhbmtfZXZlbnQoY3J0YywgY3J0Yy0+c3Rh dGUtPmV2ZW50KTsKIAkJY3J0Yy0+c3RhdGUtPmV2ZW50ID0gTlVMTDsKIAl9CiAJc3Bpbl91bmxv Y2tfaXJxKCZjcnRjLT5kZXYtPmV2ZW50X2xvY2spOwotCi0JZHJtX2NydGNfdmJsYW5rX29mZihj cnRjKTsKIH0KIAogc3RhdGljIHZvaWQgaW14X2RybV9jcnRjX3Jlc2V0KHN0cnVjdCBkcm1fY3J0 YyAqY3J0YykKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v ZHJpLWRldmVs 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 1B202C74A21 for ; Wed, 10 Jul 2019 15:04:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D91952064A for ; Wed, 10 Jul 2019 15:04:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562771093; bh=ePFrobjKeHYy4J+mj2GbAq/bzV6Kl0Uu5zEQW+zh/bw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PxkExCJGeWps9fLbBT4EHGw+9AZ57xxO8P0HXJp6ki8GfGvFw3ZM+TG8n+BOr2nOI RJBGk7RGgmh19ESordruvPgvBpVUNlxiMgtCg0ZI/XywXYAdOuGxB0DvLwfXBg7TYm u75eLfNExtLuoP05eupxl1dY1qUKn6rqC89j+NVM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728141AbfGJPDT (ORCPT ); Wed, 10 Jul 2019 11:03:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:35198 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728117AbfGJPDP (ORCPT ); Wed, 10 Jul 2019 11:03:15 -0400 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 7CEE32064A; Wed, 10 Jul 2019 15:03:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562770995; bh=ePFrobjKeHYy4J+mj2GbAq/bzV6Kl0Uu5zEQW+zh/bw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I/0dGTSNiRAfxcfAqR5nqwFzI2XpsQRWqcIQktIyqtO5fh1LHSEW1G2UPeNaH/08J m/4w5Z5gssmjkhhRGjNhVTuBc6W14z5X9VYxTcuwJavakxia4BhaihZHjW7vpbkrF6 O5+kquuZ4krhpHea3j5gzqAiRY6J87sLrisyCNPQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Robert Beckett , Daniel Vetter , Philipp Zabel , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 7/9] drm/imx: notify drm core before sending event during crtc disable Date: Wed, 10 Jul 2019 11:02:57 -0400 Message-Id: <20190710150301.7129-7-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190710150301.7129-1-sashal@kernel.org> References: <20190710150301.7129-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review 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: Robert Beckett [ Upstream commit 78c68e8f5cd24bd32ba4ca1cdfb0c30cf0642685 ] Notify drm core before sending pending events during crtc disable. This fixes the first event after disable having an old stale timestamp by having drm_crtc_vblank_off update the timestamp to now. This was seen while debugging weston log message: Warning: computed repaint delay is insane: -8212 msec This occurred due to: 1. driver starts up 2. fbcon comes along and restores fbdev, enabling vblank 3. vblank_disable_fn fires via timer disabling vblank, keeping vblank seq number and time set at current value (some time later) 4. weston starts and does a modeset 5. atomic commit disables crtc while it does the modeset 6. ipu_crtc_atomic_disable sends vblank with old seq number and time Fixes: a474478642d5 ("drm/imx: fix crtc vblank state regression") Signed-off-by: Robert Beckett Reviewed-by: Daniel Vetter Signed-off-by: Philipp Zabel Signed-off-by: Sasha Levin --- drivers/gpu/drm/imx/ipuv3-crtc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c index 11e2dcdd6b18..1b5870e7bacc 100644 --- a/drivers/gpu/drm/imx/ipuv3-crtc.c +++ b/drivers/gpu/drm/imx/ipuv3-crtc.c @@ -98,14 +98,14 @@ static void ipu_crtc_atomic_disable(struct drm_crtc *crtc, ipu_dc_disable(ipu); ipu_prg_disable(ipu); + drm_crtc_vblank_off(crtc); + spin_lock_irq(&crtc->dev->event_lock); if (crtc->state->event) { drm_crtc_send_vblank_event(crtc, crtc->state->event); crtc->state->event = NULL; } spin_unlock_irq(&crtc->dev->event_lock); - - drm_crtc_vblank_off(crtc); } static void imx_drm_crtc_reset(struct drm_crtc *crtc) -- 2.20.1