Received: by 2002:ab2:6991:0:b0:1f7:f6c3:9cb1 with SMTP id v17csp171034lqo; Tue, 7 May 2024 16:31:42 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXRsQRNg0ldLxm8H7od7q6D4lR2jslqoXNEUGIfq+qgF0WTZWZB9+eNWSDrdl3dhDVY5zYyIX87lNPpJh6xM3P0RKe3CC9BWq5q3Kn3WQ== X-Google-Smtp-Source: AGHT+IGytjDSrK7hXWw7Xyz6BTjcB2DsixdVLzRs5H8i75m1nVXu9xC8Glhtjg7QZ/NDx2XUaEk3 X-Received: by 2002:a17:902:db0a:b0:1e2:bdef:3973 with SMTP id d9443c01a7336-1eeabfa2bb3mr19530425ad.33.1715124701960; Tue, 07 May 2024 16:31:41 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715124701; cv=pass; d=google.com; s=arc-20160816; b=Tpum0BvP+QMJR5Um1X2iHu8fWVcKVc6aOCmeU/ALT162RCzB+uocs+aYnUETCQowKR gaSlkk6xHM+1EFIT8j5A7u+Om5dxCoVGeyPde1v9v+jdgjwZumrbaPQKSXIRnaq9AfTD OoNfB5Vop7M7osICsiQyHrTUabezrfjKdisnegz3o6/vPJKM3Dq7S52sz+5k76aL8bv3 WdafGCrdBBhYuKLDykq9NJe3PEWS5qResqpl7Scv7wykjVkLOFURj03b9t0Sxd2zrv28 kZGnlOxFVKtYIB3w9yOxuyBUUMDR6s7bVCxORSDlx5jkdg7ObOUjjunXyur57Glkac0+ 4gWw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=JNLvm2F6auZieQhxSHGU1EwGpfeDC0TXOmAsklHPfnA=; fh=FdW/vemVqLXHwLkwK32q80lII+gJAygn8nMAbTdtmTM=; b=ZmNM8IMtk1TvGwOnsNPzI5L+ykgmwFNMBQu400+iasQEKLfipKeOUsi9MRNyttTIHW 0yyBc6V/hl1JO6UwXF41Te33eUGJNB7YLRowJQSn4jYU98U9jXnjqwZJXqqkBR74BAji h7kGdQ3r9dsZkFrHsjYMi8MymNi1+pmKQK4mXdCIPgBhK6eh1zzLw6shkLaErTzekJSx ZreFDaUX/gc777BhuXBb3taEX2B4W5g3yJpwdEzcp2BGuobBY9wHGNi/fpcTHYe7Q561 sBu5JKA6R+R0vPe8qnUVwHShHqTbueQq0ePbDtjVnH1PCpuVEWyEfwdaZIakdJk6dmfM 4bpw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OVSW0Eap; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-172381-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-172381-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id g13-20020a170902d1cd00b001eb15819f6esi10772952plb.94.2024.05.07.16.31.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 May 2024 16:31:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-172381-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OVSW0Eap; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-172381-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-172381-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 962A5281A17 for ; Tue, 7 May 2024 23:31:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6A9CC14535A; Tue, 7 May 2024 23:09:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OVSW0Eap" 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 8F41A135A69; Tue, 7 May 2024 23:09:27 +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=1715123367; cv=none; b=cDbo3S9L0OGMHG6BPkE+4gWrOFAeMtP1QV1kVlyAHhV6V2WkQ05BKlzwqsKrEvHh9/UStIUEkM6cuxiVpOrJ6nQ97CvX4LADjGZwN9MAU2TesXr6+V+eMS9q0KuiH72/rP7Qq2hpyfwuu81xT5mEd085qf5huLbx1CMYedsLYSk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715123367; c=relaxed/simple; bh=A6ZtLxN52DVlUn5pmJLAX5JU2rQmZsA9I6/M18sPrV0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bg8qUPujkFSAe4VH2y6B4WCWkY2Au3nAS7mnCSkDB9EmNhQtnO3FqQmw57m+YAlcFeerIsxEJ0VnhrL4o22Lm2fc7+HB9LkfTUnAqnKGaJfjVs8sC9t78XkcEbQEejWkPrXm00DZoonSmC+j06CyiSD84zh9VLiBK9CSxUoZpx4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OVSW0Eap; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id C2A99C4AF63; Tue, 7 May 2024 23:09:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1715123367; bh=A6ZtLxN52DVlUn5pmJLAX5JU2rQmZsA9I6/M18sPrV0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OVSW0EapK5ji8MuwCN6bsre/Qrn4VfIexUgUtKkUAU5mzAGln6b+FZwHcn60BZKZi SDjdKKi0OWLpFcYarWvadM2w4dR5w9mZ45EA0B17E96WABHisfg+bqccoUoMOqkBho aaCvl5OaOngAG69Dt68yMPWFTA5bykpl1lHzA4RegdQhScs0NhqhsyzWGV5aZ5gto9 iGG2yicdg+syIDdyjUPabNgO9lHnC68Li9JUH3iCGiTjAGpiyC3KNaVy7agR8x85zn a2MN2+URShaZxhLE9BEvjFZK0Dzaf/QbBTO0SoWSLnBYXZt9407PlTvOavN1v+4IxP A/FiqJOg6D4nQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Gabe Teeger , Nicholas Kazlauskas , Aurabindo Pillai , 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, daniel@ffwll.ch, wayne.lin@amd.com, alvin.lee2@amd.com, charlene.liu@amd.com, sohaib.nadeem@amd.com, sunran001@208suo.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.8 38/52] drm/amd/display: Atom Integrated System Info v2_2 for DCN35 Date: Tue, 7 May 2024 19:07:04 -0400 Message-ID: <20240507230800.392128-38-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240507230800.392128-1-sashal@kernel.org> References: <20240507230800.392128-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@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.8.9 Content-Transfer-Encoding: 8bit From: Gabe Teeger [ Upstream commit 9a35d205f466501dcfe5625ca313d944d0ac2d60 ] New request from KMD/VBIOS in order to support new UMA carveout model. This fixes a null dereference from accessing Ctx->dc_bios->integrated_info while it was NULL. DAL parses through the BIOS and extracts the necessary integrated_info but was missing a case for the new BIOS version 2.3. Reviewed-by: Nicholas Kazlauskas Acked-by: Aurabindo Pillai Signed-off-by: Gabe Teeger Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1 + 1 file changed, 1 insertion(+) 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 05f392501c0ae..ab31643b10969 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c @@ -2948,6 +2948,7 @@ static enum bp_result construct_integrated_info( result = get_integrated_info_v2_1(bp, info); break; case 2: + case 3: result = get_integrated_info_v2_2(bp, info); break; default: -- 2.43.0