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=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 D35B7C48BD3 for ; Wed, 26 Jun 2019 03:45:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9F4BC2168B for ; Wed, 26 Jun 2019 03:45:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561520727; bh=OU/4WKwgggwrqpznLVHSs6qLLU2TlObBPG2bsakOXFY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IZtLESNv7gdKW/gTEBVE3MpO93i8JM2MpOdDaljm1+2XLgyibjufVSlDsnaxI+IzP jkjgjFEvgSC/9RM05Oli7QAwf+XBcuSfDagOatopBVVNW35LdbMWnCacM9wSqYjPKz dZPSMChTqf2QUDs6rhiCsZ+5ku+BPmPijtgNNmGs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727772AbfFZDp0 (ORCPT ); Tue, 25 Jun 2019 23:45:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:56964 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727300AbfFZDpW (ORCPT ); Tue, 25 Jun 2019 23:45:22 -0400 Received: from sasha-vm.mshome.net (mobile-107-77-172-74.mobile.att.net [107.77.172.74]) (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 9B0C92168B; Wed, 26 Jun 2019 03:45:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561520721; bh=OU/4WKwgggwrqpznLVHSs6qLLU2TlObBPG2bsakOXFY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EnFCUT+mrtOIgK5NaQkNULf1GUNRBUSb8INitLesocaerhWquNj15B5OMzomjX0Mj UmjTfub+S6eD+6kOByQLozQErSQXokEaR9aZlMVvWXYcpnPBx3o7DT8kxPlV2JyGzO TxDiLEZasSHR/GcUOZRq6aLD4wPWEGy/FsXGnsew= 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.14 06/21] drm/mediatek: fix unbind functions Date: Tue, 25 Jun 2019 23:44:51 -0400 Message-Id: <20190626034506.24125-6-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190626034506.24125-1-sashal@kernel.org> References: <20190626034506.24125-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 7e5e24c2152a..413313f19c36 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -851,6 +851,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