From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CAD7D1B393B; Sun, 24 Nov 2024 13:37:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732455471; cv=none; b=YBOD1sARWOMdap1vI5XL2DMx3EIn+5ELiTgJsy5q6xD9FegXJX2XQSH9JuQR29T03u4qCGYHdZD+az38JnyIb3cKICfC7japQOVXMvAKgUdecXjyVFfhqJv2tPqB6w/HOg1768TnTh4Iti0RkgHIH+/P+EuAF1aSxW7Enz5xh6g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732455471; c=relaxed/simple; bh=V6S5MdxUmQ3fdq5coagMohxAg3fw0nkc2PZWB5gcInA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wi2AGcCSHozrO0z4FFJRHXPtrd50Agow+tGO34cBDFkiWLz+5AYO3EAHK26AXzWQxYxfBP2VB7Knvly5l/vqUY+o7V/o/eDFnflK27igFpEyY6iVbPtMckoKjpVwmSLWYrOCievgGOGeQmKKXgk/+iJnLqgKFmE33BFqcRvSMxE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VhgsHv3g; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VhgsHv3g" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F7CAC4CECC; Sun, 24 Nov 2024 13:37:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732455471; bh=V6S5MdxUmQ3fdq5coagMohxAg3fw0nkc2PZWB5gcInA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VhgsHv3gnMIakqZkPM2KX9YwizQEhUM7nkSiRMXSZm86obsEz/LCuSl+2NccXNKyi uKJi2ZFS9ZFlyrpSOAGy8Watb6MiEGxR50i4GZ4ku4nho/M0nAPU7tQCmdIOH2Hz29 OrTYn5k4cx4NwEdaImgl8B04nhZC4UUNtUo6blXU/CpMas2RJJqn2PJEdOoHCKj3CT tbrqv60JNcxmyrOwi/epdiy6Db1w4BQyQMgzfAaxLKvkld4KHwd4DNItaC5FDZjP3O 2f7MvWN4mltEam1XZnZjdFcNZAMZ7yZdnEBrU4pzIqQusI2jVjZSlut3luS+L1zSBy u6Bz+7R6J+bmg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Aurabindo Pillai , Dillon Varone , Zaeem Mohamed , Daniel Wheeler , Alex Deucher , Sasha Levin , harry.wentland@amd.com, sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, simona@ffwll.ch, nicholas.kazlauskas@amd.com, alvin.lee2@amd.com, charlene.liu@amd.com, hamishclaxton@gmail.com, sohaib.nadeem@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.12 081/107] drm/amd/display: parse umc_info or vram_info based on ASIC Date: Sun, 24 Nov 2024 08:29:41 -0500 Message-ID: <20241124133301.3341829-81-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241124133301.3341829-1-sashal@kernel.org> References: <20241124133301.3341829-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.1 Content-Transfer-Encoding: 8bit From: Aurabindo Pillai [ Upstream commit 2551b4a321a68134360b860113dd460133e856e5 ] An upstream bug report suggests that there are production dGPUs that are older than DCN401 but still have a umc_info in VBIOS tables with the same version as expected for a DCN401 product. Hence, reading this tables should be guarded with a version check. Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3678 Reviewed-by: Dillon Varone Signed-off-by: Aurabindo Pillai Signed-off-by: Zaeem Mohamed Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c index c9a6de110b742..902491669cbc7 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c @@ -3127,7 +3127,9 @@ static enum bp_result bios_parser_get_vram_info( struct atom_data_revision revision; // vram info moved to umc_info for DCN4x - if (info && DATA_TABLES(umc_info)) { + if (dcb->ctx->dce_version >= DCN_VERSION_4_01 && + dcb->ctx->dce_version < DCN_VERSION_MAX && + info && DATA_TABLES(umc_info)) { header = GET_IMAGE(struct atom_common_table_header, DATA_TABLES(umc_info)); -- 2.43.0