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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 644A9C606C1 for ; Mon, 8 Jul 2019 15:46:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 38FB8216E3 for ; Mon, 8 Jul 2019 15:46:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562600767; bh=LZUOOFuhUjjyyTKRw+j19FlGYCW4JvUoBkyLfWymUR8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bA8rPj6q1+G/3E/T8GASQDt/t9fA+aWQrA1DQmn8PjDwBXvNTUGDf0s4PSDu4SAEO hz/Jr7hVo7QDFhQ9LvW5C+MyAwa+14yFVg2hYTwh4F8+6W66GXU9Kz5wYVa9ZA2GWw Km5raiKFsO2I3+iyH8stFMpIA2782OZzQciNMlik= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388170AbfGHPqG (ORCPT ); Mon, 8 Jul 2019 11:46:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:47494 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731089AbfGHPVh (ORCPT ); Mon, 8 Jul 2019 11:21:37 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 40679216C4; Mon, 8 Jul 2019 15:21:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562599296; bh=LZUOOFuhUjjyyTKRw+j19FlGYCW4JvUoBkyLfWymUR8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fdQUu3ZCAKNvMnrumODvP9hyyc/BuOkmUaGPBDLkKxdp26XoKCE7HZ2dCapG/ZXbt LjBCo76SetSR0ytP8LoF2ZktFdfHZFHSzz1qgwJUSUrGCYw7vHmQn7IqnbENlXLJga /2upV+6ieVNNeYCScQzwK8OzsdodRRNl8DvcfZGE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hsin-Yi Wang , CK Hu , Sasha Levin Subject: [PATCH 4.9 069/102] drm/mediatek: fix unbind functions Date: Mon, 8 Jul 2019 17:13:02 +0200 Message-Id: <20190708150530.033319183@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190708150525.973820964@linuxfoundation.org> References: <20190708150525.973820964@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ 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