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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 301BFC433EF for ; Tue, 9 Nov 2021 01:02:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EE9A8613A6 for ; Tue, 9 Nov 2021 01:02:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org EE9A8613A6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 41A016E1D8; Tue, 9 Nov 2021 01:02:42 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 41EDD6E1D8; Tue, 9 Nov 2021 01:02:41 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 5080961A05; Tue, 9 Nov 2021 01:02:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636419761; bh=3qFoeYw7sSYFRQnAVOgSOBo35uH9Ku6Kt7gT7S5MEzg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RkGgfTNJCpfwUjWLnUzCW8xEydVOQC94rOZaAn10MKvox7NFY6pnXsn86V/b831+K tg5D8Igx8HMaBGIuBt6KKF2EYw2oAgWgTiZlgC6+Fv4HRiDFC11UqizmH110apsvpd /VtXk3MqrzBd972VeG1iwdcnRx2Ros9w56sVoWys8wFXcPv6EEnIt5l2HtsROv99to TnDH89T1YgSEeKmUQVgZaRxR4U1MBHSObrawJoSjTRWETB3s9kX/xbifo/Y30kKAvt FpZI//37BCR3sdIVR1+WW4WyIgHBBRnMkkDSLvLRHPrQCArbZMWRySwytkj6KemEIx Pb1fbMAZoyIfw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.14 027/138] drm/amd/display: Fix null pointer dereference for encoders Date: Mon, 8 Nov 2021 12:44:53 -0500 Message-Id: <20211108174644.1187889-27-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211108174644.1187889-1-sashal@kernel.org> References: <20211108174644.1187889-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aric Cyr , airlied@linux.ie, Rodrigo Siqueira , Samson.Tam@amd.com, Meenakshikumar Somasundaram , wyatt.wood@amd.com, Jun.Lei@amd.com, hanghong.ma@amd.com, Jimmy Kizito , Sasha Levin , wenjing.liu@amd.com, amd-gfx@lists.freedesktop.org, sunpeng.li@amd.com, Jerry.Zuo@amd.com, george.shen@amd.com, harry.wentland@amd.com, stylon.wang@amd.com, Anson.Jacob@amd.com, dri-devel@lists.freedesktop.org, paul.hsieh@amd.com, agustin.gutierrez@amd.com, Wesley.Chalmers@amd.com, qingqing.zhuo@amd.com, Xinhui.Pan@amd.com, christian.koenig@amd.com, vladimir.stempen@amd.com, daniel@ffwll.ch, Alex Deucher , nicholas.kazlauskas@amd.com Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Jimmy Kizito [ Upstream commit 60f39edd897ea134a4ddb789a6795681691c3183 ] [Why] Links which are dynamically assigned link encoders have their link encoder set to NULL. [How] Check that a pointer to a link_encoder object is non-NULL before using it. Reviewed-by: Aric Cyr Reviewed-by: Meenakshikumar Somasundaram Acked-by: Rodrigo Siqueira Signed-off-by: Jimmy Kizito Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 3c8da3665a274..7b418f3f9291c 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 @@ -4681,7 +4681,7 @@ enum dc_status dp_set_fec_ready(struct dc_link *link, bool ready) link_enc->funcs->fec_set_ready(link_enc, true); link->fec_state = dc_link_fec_ready; } else { - link_enc->funcs->fec_set_ready(link->link_enc, false); + link_enc->funcs->fec_set_ready(link_enc, false); link->fec_state = dc_link_fec_not_ready; dm_error("dpcd write failed to set fec_ready"); } diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c index 75fa4adcf5f40..da7c906ba5eb5 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c @@ -1522,7 +1522,7 @@ void dcn10_power_down_on_boot(struct dc *dc) for (i = 0; i < dc->link_count; i++) { struct dc_link *link = dc->links[i]; - if (link->link_enc->funcs->is_dig_enabled && + if (link->link_enc && link->link_enc->funcs->is_dig_enabled && link->link_enc->funcs->is_dig_enabled(link->link_enc) && dc->hwss.power_down) { dc->hwss.power_down(dc); -- 2.33.0