From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.9 6/7] drm/imx: only send event on crtc disable if kept disabled Date: Wed, 10 Jul 2019 11:03:34 -0400 Message-ID: <20190710150337.7390-6-sashal@kernel.org> References: <20190710150337.7390-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 26F5B6E0FA for ; Wed, 10 Jul 2019 15:03:48 +0000 (UTC) In-Reply-To: <20190710150337.7390-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 ZWFtIGNvbW1pdCA1YWVhYjJiZmM5ZmZhNzJkM2NhNzM0MTY2MzVjYjM3ODVkZmMwNzZmIF0KClRo ZSBldmVudCB3aWxsIGJlIHNlbnQgYXMgcGFydCBvZiB0aGUgdmJsYW5rIGVuYWJsZSBkdXJpbmcg dGhlIG1vZGVzZXQKaWYgdGhlIGNydGMgaXMgbm90IGJlaW5nIGtlcHQgZGlzYWJsZWQuCgpGaXhl czogNWYyZjkxMTU3OGZiICgiZHJtL2lteDogYXRvbWljIHBoYXNlIDMgc3RlcCAxOiBVc2UgYXRv bWljIGNvbmZpZ3VyYXRpb24iKQoKU2lnbmVkLW9mZi1ieTogUm9iZXJ0IEJlY2tldHQgPGJvYi5i ZWNrZXR0QGNvbGxhYm9yYS5jb20+ClJldmlld2VkLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwu dmV0dGVyQGZmd2xsLmNoPgpTaWduZWQtb2ZmLWJ5OiBQaGlsaXBwIFphYmVsIDxwLnphYmVsQHBl bmd1dHJvbml4LmRlPgpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5v cmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2lteC9pcHV2My1jcnRjLmMgfCAyICstCiAxIGZpbGUg Y2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaW14L2lwdXYzLWNydGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pbXgvaXB1djMt Y3J0Yy5jCmluZGV4IGEyMDIyMzdjMzE1Zi4uODIxMTRmZTJhNDJhIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaW14L2lwdXYzLWNydGMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaW14L2lw dXYzLWNydGMuYwpAQCAtNzksNyArNzksNyBAQCBzdGF0aWMgdm9pZCBpcHVfY3J0Y19hdG9taWNf ZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJZHJtX2NydGNfdmJsYW5rX29mZihjcnRj KTsKIAogCXNwaW5fbG9ja19pcnEoJmNydGMtPmRldi0+ZXZlbnRfbG9jayk7Ci0JaWYgKGNydGMt PnN0YXRlLT5ldmVudCkgeworCWlmIChjcnRjLT5zdGF0ZS0+ZXZlbnQgJiYgIWNydGMtPnN0YXRl LT5hY3RpdmUpIHsKIAkJZHJtX2NydGNfc2VuZF92YmxhbmtfZXZlbnQoY3J0YywgY3J0Yy0+c3Rh dGUtPmV2ZW50KTsKIAkJY3J0Yy0+c3RhdGUtPmV2ZW50ID0gTlVMTDsKIAl9Ci0tIAoyLjIwLjEK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZl bCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA== 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 F00EFC74A21 for ; Wed, 10 Jul 2019 15:03:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B8F7121537 for ; Wed, 10 Jul 2019 15:03:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562771034; bh=TDDEW88Oz2YnyT070OxUKykGb9pOkdk28nz5KPJhTjk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iKtjfX5HiAqH/F8dEtDdbpoH3+8vnOIhxZhTu7P8qnOHIAfF7lXP/IpDrmISpoWrm QX1FgQjx+KADWoS3netDyJ99ImddOk/VTJDT3CjGAkWDtJ6NRCLy0EJ0/VcfrkMiAD hX09Gnv2kst93gOk0LCxOlZCcXrSP7idGwSL1uOM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728303AbfGJPDw (ORCPT ); Wed, 10 Jul 2019 11:03:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:35866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728287AbfGJPDs (ORCPT ); Wed, 10 Jul 2019 11:03:48 -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 2D70C216E3; Wed, 10 Jul 2019 15:03:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562771028; bh=TDDEW88Oz2YnyT070OxUKykGb9pOkdk28nz5KPJhTjk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IfetJtL4EQKUyhStghSpahbCNIPJZeMBzERwMrrwjf5OuZNaOfh7Ya7qAR8TsENyG mYe646zXRqhBmsPlY9N+xZhNmPruePF01R9p/tLwTRSXGP6IoU1KoGWkbmuWhouJtS MpuMk+iIfXfNZrxKS+uBjwDBMMWQ65l/pjuIZlAU= 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.9 6/7] drm/imx: only send event on crtc disable if kept disabled Date: Wed, 10 Jul 2019 11:03:34 -0400 Message-Id: <20190710150337.7390-6-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190710150337.7390-1-sashal@kernel.org> References: <20190710150337.7390-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 5aeab2bfc9ffa72d3ca73416635cb3785dfc076f ] The event will be sent as part of the vblank enable during the modeset if the crtc is not being kept disabled. Fixes: 5f2f911578fb ("drm/imx: atomic phase 3 step 1: Use atomic configuration") 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c index a202237c315f..82114fe2a42a 100644 --- a/drivers/gpu/drm/imx/ipuv3-crtc.c +++ b/drivers/gpu/drm/imx/ipuv3-crtc.c @@ -79,7 +79,7 @@ static void ipu_crtc_atomic_disable(struct drm_crtc *crtc, drm_crtc_vblank_off(crtc); spin_lock_irq(&crtc->dev->event_lock); - if (crtc->state->event) { + if (crtc->state->event && !crtc->state->active) { drm_crtc_send_vblank_event(crtc, crtc->state->event); crtc->state->event = NULL; } -- 2.20.1