Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4572132pxv; Tue, 6 Jul 2021 04:21:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFn23BOBISB76YqeDhAIx9dEUgsxOWb/mMyZhvv2LJrpjQUtepUPIMY20zLDhXXaQkaKoM X-Received: by 2002:a05:6e02:1be8:: with SMTP id y8mr14120551ilv.152.1625570495735; Tue, 06 Jul 2021 04:21:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625570495; cv=none; d=google.com; s=arc-20160816; b=dwFBda7Smq2z5JYu5dU8M+Ba4JcJy21Dudsuik46Dyr9LGkxHXEYVca48GGLD/+/E4 UbSa/7CM3VHBEsiHjdHmNjL9AmWOY6GwhVnsgYLpqbQEmkzGuNNftNQJ8sMjHz9ZDqkK h5s/QTXPzoWztxBazBUGPCPU9wa+FxlU9izd5u/N1Hv391KGI5S5LTZ8LxQEZXk0Gx2O mC5GUqUJpsYuMNiNdDfj4RLyF9mLcII2v4v8zPVzJv0HR2hzMdaomR9kqVreZcwEoLE3 horm7r/aHCmJxqkztIV41q9FSR+QrlfQJa22kVxnHY3sQdD7pcPsPNpkp7H143IVdHtM VfQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ZqQz4ggPnmdjt1ADFPAj2u3nLjo8icDo83Wzl6rxhBM=; b=Zb9ZIAHPPeNa+qxRM8VlvkX2e9S+77ZuBkiT2Q84iPV2NmH4ADJsBnNFmI0o7WaRN/ rdVZk+yfln95DYkJcRSTQSpOXaKh8XBWniIx0VC2ua2Lo6hAg4jp40wCmJa5eFTNu+ls qpA6YHuEpGAuMg1SuiviAvrrFxwEuPXg8ccTMKmvENC8Ottkb1IJgyaXoX55PbNT7vy9 C/J+xmXoVJPyRgGRpIrjuh9FV3WHMw9pUUSk+IUkVLjTd5QRiY3GL7A/WyowoCVvevHv iw/LxmOoy1HUn4EVRKlpxZwl62fjNlX+laC8d1TzOnrB/I3yGd+bSGWJoC6awreKo6Cq 8HCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="dZLGv4Y/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y18si16335694jak.69.2021.07.06.04.21.23; Tue, 06 Jul 2021 04:21:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="dZLGv4Y/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232836AbhGFLXc (ORCPT + 99 others); Tue, 6 Jul 2021 07:23:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:55302 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232665AbhGFLSv (ORCPT ); Tue, 6 Jul 2021 07:18:51 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id DAE9661C74; Tue, 6 Jul 2021 11:16:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570172; bh=oWnmd/UJFwruZAvf/2/WizP7J0qUKfh90AqYVxpouk4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dZLGv4Y/uGS+56B1cjgiKDzl09781/8gFIun6G2cx2IfV8eVgBpjK1k3rBWfm/Glw heuwtrHdS6QxAoR2tvQn/4Xy1xTOkL2gGT4ucta8uYWJqEJL24vbbG29V70CpQ43kg kwrLTbgNeCGDOY0C7pNJB3cp44JrSXdo7+DNcJtnP2SURbI8HocrFwNP9KL9ha7I9T 1FX/ezA9LEThImtVgq3ukY60LgXyzlsM/GY3XeIuvH1JS5+S+sh8H59DCjmaGj2wDA hITuGZGGVGAjKGiNH04XtfenDwOpCBPf6Pjze7vVD37Gl3uxtDok/g2P8dhC8v8/AO kyqlRks9hhNrw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vladimir Stempen , Wenjing Liu , Stylon Wang , Daniel Wheeler , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.13 091/189] drm/amd/display: Release MST resources on switch from MST to SST Date: Tue, 6 Jul 2021 07:12:31 -0400 Message-Id: <20210706111409.2058071-91-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706111409.2058071-1-sashal@kernel.org> References: <20210706111409.2058071-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vladimir Stempen [ Upstream commit 3f8518b60c10aa96f3efa38a967a0b4eb9211ac0 ] [why] When OS overrides training link training parameters for MST device to SST mode, MST resources are not released and leak of the resource may result crash and incorrect MST discovery during following hot plugs. [how] Retaining sink object to be reused by SST link and releasing MST resources. Signed-off-by: Vladimir Stempen Reviewed-by: Wenjing Liu Acked-by: Stylon Wang Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c index 3ff3d9e90983..f26ed50a9660 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c @@ -1784,6 +1784,8 @@ static void set_dp_mst_mode(struct dc_link *link, bool mst_enable) link->type = dc_connection_single; link->local_sink = link->remote_sinks[0]; link->local_sink->sink_signal = SIGNAL_TYPE_DISPLAY_PORT; + dc_sink_retain(link->local_sink); + dm_helpers_dp_mst_stop_top_mgr(link->ctx, link); } else if (mst_enable == true && link->type == dc_connection_single && link->remote_sinks[0] != NULL) { -- 2.30.2