Received: by 2002:ab2:6203:0:b0:1f5:f2ab:c469 with SMTP id o3csp2618375lqt; Mon, 22 Apr 2024 17:00:16 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCX49neyCDKfMYfxa0R43nGnZGA3ZBXSM1axv/8IATEv8Mbeu1FoMfL5ZNtJV1kx+LISFsJ4kZ2EV0h/6ru7Fol0patTepGaF2wek0d6tA== X-Google-Smtp-Source: AGHT+IHt9DH7uKGP8rfQPU2DhhvqgUMmKrG0VJBO9aPqYL52fyAYoHsH0SYRIufbQmiHHjsfVmMg X-Received: by 2002:a05:600c:3c95:b0:419:ec38:f322 with SMTP id bg21-20020a05600c3c9500b00419ec38f322mr5631791wmb.8.1713830416044; Mon, 22 Apr 2024 17:00:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713830416; cv=pass; d=google.com; s=arc-20160816; b=ml9aIN69UV8oLN8BcYkRHWcOMjmXU7JjuGgIQuoMndnExpIL9L1LZ+Fd660lwPMii8 N4VgUymNbDkGiRG5d6TNWFlC7SKecY10iTmx/569EBhoB7R/0sOabReiAuP8egCjcMg3 qXzvwGFWj7rY1ByJr1f0ldRG8iX97DSs2ARcAOSg9yBa2oNM/VPL8pPSXOXhlQmk+BCw p4hFE0+cuomgLi3Tc6nALtsuNoHRDnGvWlXOfkxoTiKG4Hybp87mL1LGmm63dZmVoQ6l x4BltJ3o2g9DjtJV8XB+8unmbRfLbhzPU4N3mQlXMDuIJEkrN5cAXBOE+h6py0FhVbTd xnEA== 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=sZQZHLan1liw6lQ5hMUSUNgoEvJJFhqvERt7CQAvzGY=; fh=BmECO34AROsk1APx4WxhwneG359wujCOtQqTSrPGTvM=; b=jOkPrm7wjBM50XDjgsEK1oAlJ67sMP50HK/1utE44w/+OZRnuCLkc8IOBuL1jpMhqa sHfZBh+cmibdztHO2msKR5nAhr900es+8uOhkYlH7FCoJSsJjS10FAqceEvnc1cUfO0b I567sAU5285QRhss+5PuzMWI1S7wzq0ERe2xuHD+h7UAqNAh+J8OztUtbCKNk6cQQ+zZ rUvIrrJKwfCQ+sSyf8IAzPko3vZbTprlpfLdJ7rQbR61vAt/gKITHOw3I/RuJ9AMXMgq 5V9YAE1ZoybEO2PAF6e3mnVuzB0MS3ACb/zVJNkRNiTNKFaaMP3Fw2/W4RLdCoewKnuk EwGw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ol9kyWTF; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-154245-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-154245-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id c29-20020a50d65d000000b0056fe1c1e455si6291920edj.429.2024.04.22.17.00.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Apr 2024 17:00:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-154245-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ol9kyWTF; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-154245-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-154245-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 am.mirrors.kernel.org (Postfix) with ESMTPS id B60641F23612 for ; Tue, 23 Apr 2024 00:00:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3B6A31598E1; Mon, 22 Apr 2024 23:55:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ol9kyWTF" 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 5CE7246521; Mon, 22 Apr 2024 23:55:01 +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=1713830101; cv=none; b=jrVK4FLgcnhq3n1H24O0Udqy5IVCCYUFi5QVdrVIAz2CbP2E0aBRnUJOvLp+mF5d8/uQH13CgOkKHXZAdhqDYjS4AXee82MZMeimD1A3im4ipYCO+3T0sPGBX36XH3JDB7e+iXJaoYtvUaux2zDUc2kLtGjes49BSZUeV/pe1P8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713830101; c=relaxed/simple; bh=MwuY0hLb+N6b9YB79jB7wWRz6DDBHF+sgVjco9EEbO0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QXUsLc7w8WdHZ6WTlSFb1BhWCTpQpTxpAfk4OBE5/YiWcoMLtSzHPlPZp1BQMwwwyqwwYHMuqYaHekeEKKAYXKj7Uu3fCvzBwl4coGMH1oM/QNVC4P+dzoPpUyHefhGBOCL5rmHbl4fQykgKsSednJwx790ajuSLZ8YCmM0EGUs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ol9kyWTF; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3F49C3277B; Mon, 22 Apr 2024 23:54:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713830101; bh=MwuY0hLb+N6b9YB79jB7wWRz6DDBHF+sgVjco9EEbO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ol9kyWTFAm94kQuApkaCUnnP4G+JAueJpcCHG5V7ZIJ2hIyAOB8UbskPyLmg5M63N rMibFgMsrykG9Ls4PPAuclkEOj2W5kZ0ZI9G6/hcUiB3Nvblr+jnblPdLnFgrteG9F CI0nXqORkmoOGnmxUcdA5+0dwZW28bMSTuEeCBIC2diZ+us+ih699vConGmc4Gxiaj uJOTPOu0VDCo2CmW2gGD2+XtJfnlyaw4DlUzIrycu1z494Y4g5xkg9l0j83nIi2Vj6 YOtw1sWlM5DwCaLq1vB+fpZ2Uvs6n4WpFu6u1dCEKu2scpduHv9L00z0Yyw5hpAvpS KZ6pCw9KcChaw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Li Ma , Yifan Zhang , 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, alex.hung@amd.com, hamza.mahfooz@amd.com, wayne.lin@amd.com, srinivasan.shanmugam@amd.com, joshua@froggi.es, haoping.liu@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.8 27/43] drm/amd/display: add DCN 351 version for microcode load Date: Mon, 22 Apr 2024 19:14:13 -0400 Message-ID: <20240422231521.1592991-27-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240422231521.1592991-1-sashal@kernel.org> References: <20240422231521.1592991-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.7 Content-Transfer-Encoding: 8bit From: Li Ma [ Upstream commit d4396924c3d44f34d0643f650e70892e07f3677f ] There is a new DCN veriosn 3.5.1 need to load Signed-off-by: Li Ma Reviewed-by: Yifan Zhang Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 718e533ab46dd..0d3e553647993 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -147,6 +147,9 @@ MODULE_FIRMWARE(FIRMWARE_NAVI12_DMCU); #define FIRMWARE_DCN_35_DMUB "amdgpu/dcn_3_5_dmcub.bin" MODULE_FIRMWARE(FIRMWARE_DCN_35_DMUB); +#define FIRMWARE_DCN_351_DMUB "amdgpu/dcn_3_5_1_dmcub.bin" +MODULE_FIRMWARE(FIRMWARE_DCN_351_DMUB); + /* Number of bytes in PSP header for firmware. */ #define PSP_HEADER_BYTES 0x100 @@ -4776,6 +4779,9 @@ static int dm_init_microcode(struct amdgpu_device *adev) case IP_VERSION(3, 5, 0): fw_name_dmub = FIRMWARE_DCN_35_DMUB; break; + case IP_VERSION(3, 5, 1): + fw_name_dmub = FIRMWARE_DCN_351_DMUB; + break; default: /* ASIC doesn't support DMUB. */ return 0; -- 2.43.0