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,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 9FA35C2BB86 for ; Sat, 11 Apr 2020 23:46:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 70248206F7 for ; Sat, 11 Apr 2020 23:46:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586648791; bh=dOUycVNeaP9QZ2jnw7c8HSAmuHLJ1l+I7jvRXSXZbMg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FsDl34iFZVFFk2f65+gZdr6G8U1U3LTCEIkekS1JBkPg0JpJivZwwqOqxCHXsNgNN EQT5ZBOv9owS3Hu4o7eRZW6TGNYAeHsSz8gRWbIvc8SFqVOy/eL7x1IUTSol2GSNcT 8YCIVOXIzz2XW8cyGi+vUTNFUVG+SK0m7Tgvzls0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727884AbgDKXFQ (ORCPT ); Sat, 11 Apr 2020 19:05:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:39174 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727877AbgDKXFQ (ORCPT ); Sat, 11 Apr 2020 19:05:16 -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 62F6420787; Sat, 11 Apr 2020 23:05:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646316; bh=dOUycVNeaP9QZ2jnw7c8HSAmuHLJ1l+I7jvRXSXZbMg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1WfWBThYuInJzuEy9OXDRNIxMkzdLL9IT+eMref3vHxvub7CMj1EtKLvQQsVuVGLA Klyn2ucNzt3Uo3VzBrPrbYiZLoHwvUZ7SY6mYrecPWFlUBn5ntq7041teojCArRQQC KrSTEsRcE0NZ5IB6lvr7lP1RDuClSOgHcHOO2RaA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yannick Fertre , Philippe Cornu , Benjamin Gaignard , Sasha Levin , dri-devel@lists.freedesktop.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.6 072/149] drm/stm: ltdc: check crtc state before enabling LIE Date: Sat, 11 Apr 2020 19:02:29 -0400 Message-Id: <20200411230347.22371-72-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200411230347.22371-1-sashal@kernel.org> References: <20200411230347.22371-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: Yannick Fertre [ Upstream commit a6bd58c51ac43083f3977057a7ad668def55812f ] Following investigations of a hardware bug, the LIE interrupt can occur while the display controller is not activated. LIE interrupt (vblank) don't have to be set if the CRTC is not enabled. Signed-off-by: Yannick Fertre Acked-by: Philippe Cornu Signed-off-by: Benjamin Gaignard Link: https://patchwork.freedesktop.org/patch/msgid/1579601650-7055-1-git-send-email-yannick.fertre@st.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/stm/ltdc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c index c2815e8ae1da2..ea654c7280f7e 100644 --- a/drivers/gpu/drm/stm/ltdc.c +++ b/drivers/gpu/drm/stm/ltdc.c @@ -648,9 +648,14 @@ static const struct drm_crtc_helper_funcs ltdc_crtc_helper_funcs = { static int ltdc_crtc_enable_vblank(struct drm_crtc *crtc) { struct ltdc_device *ldev = crtc_to_ltdc(crtc); + struct drm_crtc_state *state = crtc->state; DRM_DEBUG_DRIVER("\n"); - reg_set(ldev->regs, LTDC_IER, IER_LIE); + + if (state->enable) + reg_set(ldev->regs, LTDC_IER, IER_LIE); + else + return -EPERM; return 0; } -- 2.20.1