From patchwork Thu Jun 20 08:40:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1949964 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W4Yqr16mcz20XW for ; Thu, 20 Jun 2024 18:41:27 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1sKDM9-00021c-TQ; Thu, 20 Jun 2024 08:41:21 +0000 Received: from mail-pg1-f176.google.com ([209.85.215.176]) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1sKDM8-00020z-FG for kernel-team@lists.ubuntu.com; Thu, 20 Jun 2024 08:41:20 +0000 Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-70df213542bso474254a12.3 for ; Thu, 20 Jun 2024 01:41:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718872878; x=1719477678; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LxYctuctR/HYdxTRMSG6SYxo63l5Y9oKjtUt0Z/OkD4=; b=HguMtDYWt3s1sz/pC5s+3YpdEh8i8UkJX0aDeKzy1S5UZO5zxJh7mAlLpRHBR81jy7 gsPQ3KHDnNwEyjh9EEI2nXRGuqeU2oJYkCtEa4Lh77/Oee7mfHGkGaXHxsemGxPxImlq eLJxHVkIT+9iWe91AkiFoy+jSJiO43Pqb4CU+18GSRPxfBW9U0sQvjU2aLfB2crWluXs r0hPmIZfaal74wowuS3Ju7H6sSOT4skC7BiWodj3xT5EOIRhLDOrqY3ct74vLhIHOr95 yBGwsz0PsPhcg8SUHFS4auJv6TTvRdJIafO8Pl6S8JqfskVe7xAPIWngQL/nhiwlMkVW gCxg== X-Gm-Message-State: AOJu0Yx4HaBUfPLL2iP8hECCJ/uKwJroNkr5iroStY/QJygQmXbBEUlo cqFnOaddQbBmdTbiJFpHAaK5T9Hxj5ai9rv1e82KL5AMDwjSG4rZkCOhO6YA X-Google-Smtp-Source: AGHT+IEEV2qEyY2jgBLQkxKEZCFaJNjxszbSqG6QMZh0hXr7F/sbOdVtek0GpqivoUfLGGwfpG0vgQ== X-Received: by 2002:a05:6a20:7195:b0:1b8:4107:ce35 with SMTP id adf61e73a8af0-1bcbb43e9fbmr4319303637.28.1718872877554; Thu, 20 Jun 2024 01:41:17 -0700 (PDT) Received: from localhost.localdomain (211-75-139-220.hinet-ip.hinet.net. [211.75.139.220]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f855ee8096sm131823215ad.171.2024.06.20.01.41.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jun 2024 01:41:16 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1][SRU][Noble] drm/amd/display: Atom Integrated System Info v2_2 for DCN35 Date: Thu, 20 Jun 2024 16:40:42 +0800 Message-ID: <20240620084042.515243-2-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240620084042.515243-1-vicamo.yang@canonical.com> References: <20240620084042.515243-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.215.176; envelope-from=vicamo@gmail.com; helo=mail-pg1-f176.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Gabe Teeger BugLink: https://bugs.launchpad.net/bugs/2066233 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 (cherry picked from commit 9a35d205f466501dcfe5625ca313d944d0ac2d60) Signed-off-by: You-Sheng Yang --- 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: