From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.9 05/11] drm/mediatek: fix unbind functions Date: Tue, 25 Jun 2019 23:45:55 -0400 Message-ID: <20190626034602.24367-5-sashal@kernel.org> References: <20190626034602.24367-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 B8F8B6E27E for ; Wed, 26 Jun 2019 03:46:15 +0000 (UTC) In-Reply-To: <20190626034602.24367-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: Sasha Levin , dri-devel@lists.freedesktop.org, Hsin-Yi Wang List-Id: dri-devel@lists.freedesktop.org RnJvbTogSHNpbi1ZaSBXYW5nIDxoc2lueWlAY2hyb21pdW0ub3JnPgoKWyBVcHN0cmVhbSBjb21t aXQgOGZkN2EzN2IxOTFmOTM3MzdmNjI4MGE5YjVkZTY1Zjk4YWNjMTJjOSBdCgpkZXRhdGNoIHBh bmVsIGluIG10a19kc2lfZGVzdHJveV9jb25uX2VuYygpLCBzaW5jZSAuYmluZCB3aWxsIHRyeSB0 bwphdHRhY2ggaXQgYWdhaW4uCgpGaXhlczogMmU1NGMxNGUzMTBmICgiZHJtL21lZGlhdGVrOiBB ZGQgRFNJIHN1YiBkcml2ZXIiKQpTaWduZWQtb2ZmLWJ5OiBIc2luLVlpIFdhbmcgPGhzaW55aUBj aHJvbWl1bS5vcmc+ClNpZ25lZC1vZmYtYnk6IENLIEh1IDxjay5odUBtZWRpYXRlay5jb20+ClNp Z25lZC1vZmYtYnk6IFNhc2hhIExldmluIDxzYXNoYWxAa2VybmVsLm9yZz4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RzaS5jIHwgMiArKwogMSBmaWxlIGNoYW5nZWQsIDIgaW5z ZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHNp LmMgYi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RzaS5jCmluZGV4IGVhYTVhMjI0MGMw Yy4uYmRiZjM1ODY5N2NkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRr X2RzaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHNpLmMKQEAgLTcyMCw2 ICs3MjAsOCBAQCBzdGF0aWMgdm9pZCBtdGtfZHNpX2Rlc3Ryb3lfY29ubl9lbmMoc3RydWN0IG10 a19kc2kgKmRzaSkKIAkvKiBTa2lwIGNvbm5lY3RvciBjbGVhbnVwIGlmIGNyZWF0aW9uIHdhcyBk ZWxlZ2F0ZWQgdG8gdGhlIGJyaWRnZSAqLwogCWlmIChkc2ktPmNvbm4uZGV2KQogCQlkcm1fY29u bmVjdG9yX2NsZWFudXAoJmRzaS0+Y29ubik7CisJaWYgKGRzaS0+cGFuZWwpCisJCWRybV9wYW5l bF9kZXRhY2goZHNpLT5wYW5lbCk7CiB9CiAKIHN0YXRpYyB2b2lkIG10a19kc2lfZGRwX3N0YXJ0 KHN0cnVjdCBtdGtfZGRwX2NvbXAgKmNvbXApCi0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJp LWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA== 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.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 90580C48BD3 for ; Wed, 26 Jun 2019 03:46:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5AC80205ED for ; Wed, 26 Jun 2019 03:46:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561520780; bh=TLYly8Gn/R1QAmCHrTOb5ZqA2BhMgLFISfGO6vvHsgI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=fYmxp7DJZRgXouKICH2BdCqQZUaHhodIMVn3Nlko9SewusxVnIOtiE8H4+gbcf3zh +O1ChPzXUhXrjbnp5quw6NZkSf5f+kkaVVMESFELDBlNUV2yY7qUggExPlDUn0tTyM KP9vIUe/AzA5lUswggPoUuUPavEWj8Uy24lxV4A8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727941AbfFZDqS (ORCPT ); Tue, 25 Jun 2019 23:46:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:57958 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727927AbfFZDqQ (ORCPT ); Tue, 25 Jun 2019 23:46:16 -0400 Received: from sasha-vm.mshome.net (mobile-107-77-172-82.mobile.att.net [107.77.172.82]) (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 A508F214DA; Wed, 26 Jun 2019 03:46:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561520775; bh=TLYly8Gn/R1QAmCHrTOb5ZqA2BhMgLFISfGO6vvHsgI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eBWl0g98MLiZX4ZXWVScDn5INnXb0oO8R5FXgKtcT94heuhnVXJwf9x4/EUlqI67I IP1Kc+b5AOMxs5syaYZHqRSbB+vBsCbhaPeX9MLZfGU+jUJQdqjH6OwxruR5Ruf85s gfkJF/dl0L/Gp8yBv5dce/zseYx2Qmo2Bxma2igY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hsin-Yi Wang , CK Hu , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.9 05/11] drm/mediatek: fix unbind functions Date: Tue, 25 Jun 2019 23:45:55 -0400 Message-Id: <20190626034602.24367-5-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190626034602.24367-1-sashal@kernel.org> References: <20190626034602.24367-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: Hsin-Yi Wang [ Upstream commit 8fd7a37b191f93737f6280a9b5de65f98acc12c9 ] detatch panel in mtk_dsi_destroy_conn_enc(), since .bind will try to attach it again. Fixes: 2e54c14e310f ("drm/mediatek: Add DSI sub driver") Signed-off-by: Hsin-Yi Wang Signed-off-by: CK Hu Signed-off-by: Sasha Levin --- drivers/gpu/drm/mediatek/mtk_dsi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index eaa5a2240c0c..bdbf358697cd 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -720,6 +720,8 @@ static void mtk_dsi_destroy_conn_enc(struct mtk_dsi *dsi) /* Skip connector cleanup if creation was delegated to the bridge */ if (dsi->conn.dev) drm_connector_cleanup(&dsi->conn); + if (dsi->panel) + drm_panel_detach(dsi->panel); } static void mtk_dsi_ddp_start(struct mtk_ddp_comp *comp) -- 2.20.1