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 4923CC74A21 for ; Wed, 10 Jul 2019 15:04:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1642521537 for ; Wed, 10 Jul 2019 15:04:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562771076; bh=2XnBekel31iUDZXG+ZqF52COM3vc2mVRd223+zpMN2s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ovMLjQKsSf/AQxTp11FbhNJFpLZqdOPGA63TVy4wzh72dTjdMKkVQ9/E7tmql+vFu 4qz4AHgBA2owrNIgOAvM4Oc3yWII2ADGcqbRxYYjtlL6dny9xdBA60LBmyoqzN7tpU ESdk8YjSorBguarY1w7ILX454YbHMDfEZ6DI2ptY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727505AbfGJPEf (ORCPT ); Wed, 10 Jul 2019 11:04:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:35570 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728219AbfGJPDf (ORCPT ); Wed, 10 Jul 2019 11:03:35 -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 059A62064A; Wed, 10 Jul 2019 15:03:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562771014; bh=2XnBekel31iUDZXG+ZqF52COM3vc2mVRd223+zpMN2s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e7OqnpyEuRPJVzpgWLGiav15RiRtpmd1gm2aWJFRKWcLAALtJD1htVLCAmEHEAq+q SmMhzm4G8Mv9EIubGRdcUarfIzW+PObHiQyi1wfmspNsmsSnc5zxQ5N4ABZA2e3msE TD5eKc2+WmxJQ4ZBjOklpu+CoqTql3Dey9Fjd7l4= 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.14 7/8] drm/imx: only send event on crtc disable if kept disabled Date: Wed, 10 Jul 2019 11:03:17 -0400 Message-Id: <20190710150319.7258-7-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190710150319.7258-1-sashal@kernel.org> References: <20190710150319.7258-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 7845202d0486..12dd261fc308 100644 --- a/drivers/gpu/drm/imx/ipuv3-crtc.c +++ b/drivers/gpu/drm/imx/ipuv3-crtc.c @@ -102,7 +102,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