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,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 D0287C48BD3 for ; Wed, 26 Jun 2019 03:41:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A10DA216F4 for ; Wed, 26 Jun 2019 03:41:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561520518; bh=sNCNajBnIICgdxOIF1Sqb95OcKzLhp3mLHklpLODoFs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xhjU2Ii+3dLRH5VaoXJ9mjhDKdDAFMJlPcMeZn2npS45/yzlipjjcFp62JhyRvKsC cMUoH/fg6QjJyyEmiixnFSFWvN5Iu16fFjD5x1I5ecw4HRHY1vRELZgqNI555UUbXi m6Lv8GRTA4b0cI56bAPybswdR2BPhvVu5tKF2eOc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726950AbfFZDl5 (ORCPT ); Tue, 25 Jun 2019 23:41:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:52506 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726574AbfFZDlz (ORCPT ); Tue, 25 Jun 2019 23:41:55 -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 C2204216F4; Wed, 26 Jun 2019 03:41:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561520514; bh=sNCNajBnIICgdxOIF1Sqb95OcKzLhp3mLHklpLODoFs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=veTNGYHPRGns0PGa7d7v9CAxAHlqpestkIAdaDZynNDo06K+AXRdRvExL1giGi4AX 90bxd8XOMK3rD5Q/N/UR8GV7K8YJdFajWgMGDYSnLN48qEQNFBzqaMhaYn77tN9sjd l+goSg2wqikPZdEWPl5OuuVuGFaFwyRPtO+njVwY= 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 5.1 15/51] drm/mediatek: fix unbind functions Date: Tue, 25 Jun 2019 23:40:31 -0400 Message-Id: <20190626034117.23247-15-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190626034117.23247-1-sashal@kernel.org> References: <20190626034117.23247-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 b00eb2d2e086..1ae3be99e0ff 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -844,6 +844,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