From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 2130123D7E6; Sat, 30 May 2026 17:56:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780163816; cv=none; b=jHtD6dy4/REaOjbj9mNMqqGb357HAl11sFuobiM28iv97AlDmxhrvGjWhLZy1lh/8/jeStewle+3JeVs+FGavM4dCJuLNsOEiI7vFr3PT7sB3TkkjWncqwFd+5R9ysvAGeTkWG22/HdgY3SkdUuMp/YB+GjxkVSS4Cc5/T+R0Ho= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780163816; c=relaxed/simple; bh=AVF1yD7eJdU/WjosqsHYt9WsMlt57AJE9LftHPClJqM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GIdrqqpsqAY/Lqqvu7NXYf1HYKrOBPOhm/qB/o3xf7EgfHKNd38zwK/ZZbSe+tMmBNfel1Kx+0ep2POqVDsaWDVC5VHeaRlkzjoOqgVap1YQqZY1sq4tqF9Cndp0PrdttZWYJ+5XRXQUozcjlgybENsK+X2PnxXe+JryuD8ON3U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hkwMMQd6; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="hkwMMQd6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D12A1F00893; Sat, 30 May 2026 17:56:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780163814; bh=cn3TQpdOX5bwCOKox6YrGtaBQ/m6KOjGlRQ6f747ALU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hkwMMQd6Q1Mj1LMtSVcrH0AF3cle8qzKlg5QmmzQYb17rPiVMooOrzzbxQFl9XpNE OcSy8EivSWVbxU3eFpX7iGYfDmyHXu9HolHdiPiia2UAlTTLVC763CBOrStJZwglTO VewErN6WLULy19haNHH/9yCJ3geqgOL4fkazryoo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Timur=20Krist=C3=B3f?= , Kent Russell , Alex Deucher Subject: [PATCH 5.15 371/776] drm/amdgpu/pm: add missing revision check for CI Date: Sat, 30 May 2026 18:01:25 +0200 Message-ID: <20260530160250.133238845@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160240.228940103@linuxfoundation.org> References: <20260530160240.228940103@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alex Deucher commit 2a561b361b7681509710f3cfc3d95d54c87ac69f upstream. The ci_populate_all_memory_levels() workaround only applies to revision 0 SKUs. Link: https://gitlab.freedesktop.org/drm/amd/-/work_items/1816 Fixes: 9f4b35411cfe ("drm/amd/powerplay: add CI asics support to smumgr (v3)") Reviewed-by: Timur Kristóf Reviewed-by: Kent Russell Signed-off-by: Alex Deucher (cherry picked from commit 1db15ba8f72f400bbad8ae0ce24fafc43429d4bd) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c +++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c @@ -1325,8 +1325,9 @@ static int ci_populate_all_memory_levels dev_id = adev->pdev->device; - if ((dpm_table->mclk_table.count >= 2) - && ((dev_id == 0x67B0) || (dev_id == 0x67B1))) { + if ((dpm_table->mclk_table.count >= 2) && + ((dev_id == 0x67B0) || (dev_id == 0x67B1)) && + (adev->pdev->revision == 0)) { smu_data->smc_state_table.MemoryLevel[1].MinVddci = smu_data->smc_state_table.MemoryLevel[0].MinVddci; smu_data->smc_state_table.MemoryLevel[1].MinMvdd =