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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 EEE83C606BD for ; Mon, 8 Jul 2019 15:34:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC7B0216E3 for ; Mon, 8 Jul 2019 15:34:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562600066; bh=V836edaPtW1AbGnQQ629cXtx0K4VHQBNzBFbKxzKsws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kkYDWp2+1TkyUxa7dErXNbP5GVgSgaH3K8IYJ+Oxu89ovmTQ9eniwQeTFLC8TUc0B qlfyrdFGw4p1t8bLAinePVD8TXEQyVbPZ9Dx0pMmA/UqF39C67iARtospEYErq2KQs UNeveun5fps7pCw64Aqt1EQ4786sd90DRQ0VQtJ0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390538AbfGHPeZ (ORCPT ); Mon, 8 Jul 2019 11:34:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:36492 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390506AbfGHPeQ (ORCPT ); Mon, 8 Jul 2019 11:34:16 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3770320651; Mon, 8 Jul 2019 15:34:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562600055; bh=V836edaPtW1AbGnQQ629cXtx0K4VHQBNzBFbKxzKsws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k2KgCNZsOuxDVQd3TVQLf1V8U4KNgOPAihot+sVW5is6nX6t3TB3OFu9Ej4irAxYm w70QsRXRWzjbjFS0meBiftvTS0VFXArVVRaxSyjr1yi6TaX1OQAY7C5zT3Rw90dCXq rVr+LeholNhdtULju1HcKEN4Frn2LRh4eHH2p3CM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Robert Beckett , Daniel Vetter , Philipp Zabel Subject: [PATCH 5.1 79/96] drm/imx: only send event on crtc disable if kept disabled Date: Mon, 8 Jul 2019 17:13:51 +0200 Message-Id: <20190708150530.733276041@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190708150526.234572443@linuxfoundation.org> References: <20190708150526.234572443@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 commit 5aeab2bfc9ffa72d3ca73416635cb3785dfc076f upstream. 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: Greg Kroah-Hartman --- drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/imx/ipuv3-crtc.c +++ b/drivers/gpu/drm/imx/ipuv3-crtc.c @@ -94,7 +94,7 @@ static void ipu_crtc_atomic_disable(stru 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; }