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,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 2D869C388F7 for ; Tue, 3 Nov 2020 21:48:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CA9B822384 for ; Tue, 3 Nov 2020 21:48:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604440117; bh=NpASS000Ip1rXIuNT99G/rbIO+PVGDUeTdGfBOxoxNc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tFzTkFKTbiPXjhHZeb7DVWrfiffsoHwwzhCemGLm8PDhsZVo4xBhT6yfprXdpv4AW iYKUbOPFin3yZK8g3tGYMN0hfSlyFETmKDrSt3RxbhRoaVeaI1oql1qjV8j3CfxvNk KzewB5dsACzS4QSwuodRigf/NE4lD8Spnx0aDCFo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732178AbgKCVsh (ORCPT ); Tue, 3 Nov 2020 16:48:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:43854 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731755AbgKCUuG (ORCPT ); Tue, 3 Nov 2020 15:50:06 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 2DE0720719; Tue, 3 Nov 2020 20:50:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436605; bh=NpASS000Ip1rXIuNT99G/rbIO+PVGDUeTdGfBOxoxNc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LeD36dLMcBEg++2gHinNebJBS59LenhPa0AU4NZbfOSZ64SeVn0gyc7q/qf/jXxOk Z2CKwGw3+NEpjUG2kgmpKBOTMyTO0FF0Hc7Xtf+RISBAc4BvHij2f4c1QgycQ4u2mG VQF2dhaHHASDWTsdT83n3bi32m76b0yPqepPOcf0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicholas Kazlauskas , Andrey Grodzovsky , Alex Deucher Subject: [PATCH 5.9 323/391] drm/amd/display: Avoid MST manager resource leak. Date: Tue, 3 Nov 2020 21:36:14 +0100 Message-Id: <20201103203408.922157208@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrey Grodzovsky commit 5dff80bdce9e385af5716ed083f9e33e814484ab upstream. On connector destruction call drm_dp_mst_topology_mgr_destroy to release resources allocated in drm_dp_mst_topology_mgr_init. Do it only if MST manager was initilized before otherwsie a crash is seen on driver unload/device unplug. Reviewed-by: Nicholas Kazlauskas Signed-off-by: Andrey Grodzovsky Acked-by: Alex Deucher Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4882,6 +4882,13 @@ static void amdgpu_dm_connector_destroy( struct amdgpu_device *adev = connector->dev->dev_private; struct amdgpu_display_manager *dm = &adev->dm; + /* + * Call only if mst_mgr was iniitalized before since it's not done + * for all connector types. + */ + if (aconnector->mst_mgr.dev) + drm_dp_mst_topology_mgr_destroy(&aconnector->mst_mgr); + #if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) ||\ defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)