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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 076BDC433DF for ; Wed, 19 Aug 2020 13:25:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D5D32206FA for ; Wed, 19 Aug 2020 13:25:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597843530; bh=+Xsym0YncEVFgr6rZswqXSwaLPiwP7mkHn+e9JPoLTU=; h=Subject:To:Cc:From:Date:List-ID:From; b=c2xghmzQtzrUqlePZ4Hm/EiaUZIg/nzVjuT5fKUdyyjbX86aEhWZTw1QgWIg9lbs9 J0OCE4XV9FjCgRQ2Vz/LzFvSH0HVA0HhHpFZYGcrQGt7NLukLtDzAqCuS++e/yNQIE JNHzuWf5EUqdWdIn0QDb6Cbo/phKzHSGHhr8C1jg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726961AbgHSNZW (ORCPT ); Wed, 19 Aug 2020 09:25:22 -0400 Received: from forward1-smtp.messagingengine.com ([66.111.4.223]:47185 "EHLO forward1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728548AbgHSNY7 (ORCPT ); Wed, 19 Aug 2020 09:24:59 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailforward.nyi.internal (Postfix) with ESMTP id 919A41942CA0; Wed, 19 Aug 2020 09:24:45 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Wed, 19 Aug 2020 09:24:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=mHeWbO YURKbh/lrSEvcdsUZr8W5bL60ayhU3m6VdEto=; b=s+lJLwzPF7OmK6l+crrR6Z wyxGEyOFeUWm5LPapnf/ttuXpRAz0OHmEQYGmE87JwwG2FjH3r0S7r64KUSt5FaB 1f0zo6FJBZSz5Ty1AGE5s75M4MXSppYOrLzcMB/ECWphIPUpd9LHlouJOkn2iOc4 lHM1C4qlgNuhGoOZukagHf3OcrrK4mhF0BzMptNW5cUagRTDcZaqou/kDJdSEBsX Vkg6S+r4nJBcHR9tprzt89gGlQX03R1/8zf/kqN99Gppo+l9H6+KfQWqyz3QALIg kswFPGJC1TqOmz1olorQU1UWRilweQqFRsEnO8f2VFxTf3tM42P+3phVlDvl3P9A == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedruddtkedggeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecuggftrfgrthhtvghrnhepieetveehuedvhfdtgfdvieeiheehfeelveevheejud etveeuveeludejjefgteehnecukfhppeekfedrkeeirdekledruddtjeenucevlhhushht vghrufhiiigvpeeinecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhh drtghomh X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 264F930600A9; Wed, 19 Aug 2020 09:24:45 -0400 (EDT) Subject: FAILED: patch "[PATCH] drm/imx: imx-ldb: Disable both channels for split mode in" failed to apply to 4.9-stable tree To: victor.liu@nxp.com, kernel@pengutronix.de, linux-imx@nxp.com, p.zabel@pengutronix.de, s.hauer@pengutronix.de, stable@vger.kernel.org Cc: From: Date: Wed, 19 Aug 2020 15:25:00 +0200 Message-ID: <1597843500209116@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 3b2a999582c467d1883716b37ffcc00178a13713 Mon Sep 17 00:00:00 2001 From: Liu Ying Date: Thu, 9 Jul 2020 10:28:52 +0800 Subject: [PATCH] drm/imx: imx-ldb: Disable both channels for split mode in enc->disable() Both of the two LVDS channels should be disabled for split mode in the encoder's ->disable() callback, because they are enabled in the encoder's ->enable() callback. Fixes: 6556f7f82b9c ("drm: imx: Move imx-drm driver out of staging") Cc: Philipp Zabel Cc: Sascha Hauer Cc: Pengutronix Kernel Team Cc: NXP Linux Team Cc: Signed-off-by: Liu Ying Signed-off-by: Philipp Zabel diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c index 909682a74474..8791d60be92e 100644 --- a/drivers/gpu/drm/imx/imx-ldb.c +++ b/drivers/gpu/drm/imx/imx-ldb.c @@ -296,18 +296,19 @@ static void imx_ldb_encoder_disable(struct drm_encoder *encoder) { struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder); struct imx_ldb *ldb = imx_ldb_ch->ldb; + int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN; int mux, ret; drm_panel_disable(imx_ldb_ch->panel); - if (imx_ldb_ch == &ldb->channel[0]) + if (imx_ldb_ch == &ldb->channel[0] || dual) ldb->ldb_ctrl &= ~LDB_CH0_MODE_EN_MASK; - else if (imx_ldb_ch == &ldb->channel[1]) + if (imx_ldb_ch == &ldb->channel[1] || dual) ldb->ldb_ctrl &= ~LDB_CH1_MODE_EN_MASK; regmap_write(ldb->regmap, IOMUXC_GPR2, ldb->ldb_ctrl); - if (ldb->ldb_ctrl & LDB_SPLIT_MODE_EN) { + if (dual) { clk_disable_unprepare(ldb->clk[0]); clk_disable_unprepare(ldb->clk[1]); }