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 4C0A73F9278; Fri, 15 May 2026 16:22:40 +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=1778862160; cv=none; b=OZowV8skj75V24APVVng4pTHuDluFr+hyWri+FTQMFZIGmfYbzPFSP7VYXLjhtB3z94IuRLHY25e35F7MJC350HtM2cvXdsJKcPB4590gdPZBpChnrl8Ex4glHhJwB+Bq9hkQUDP/kInkEYXIEEsa88jW9xiq7Uh+cL29ZogY70= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778862160; c=relaxed/simple; bh=SfxOnnkeiUo5po71JtvHfOdJr7ArPNjhe8rauc4EIWE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=H78y7iGoopfBDmMMsXhAajceE3vT2jH2lJ1ZGqayWbYAxGBza1w3mzBPQjCsEkl3c5UeP49g1Ihy6ZTDtv1z+3MpmXhO2IrVXk50Y4oW2wb7736tAMt+j6g+QF6ZOMOtZcigZyzr6b5RXRpG8/Nm9xhPIKAlO27LQEODDV3WKdE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=T2ThZbBB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="T2ThZbBB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 924DDC2BCB0; Fri, 15 May 2026 16:22:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778862159; bh=SfxOnnkeiUo5po71JtvHfOdJr7ArPNjhe8rauc4EIWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T2ThZbBBqjI9rQuhE5liUxrm3Dp6CR51wDA+1BW1N4RMObI7LwHlQk+WGF6WU8GAQ N4+Y1xdLVLZ5E6yBPZlpfYQUpuf9/fvR/kf2F8k13fWT9oSkA+Y2DlfcbgvVWJ4Olm Km04xP+j6l5RcsZEFJcGncnl1JPKpyzBXOymxW/I= 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 6.18 131/188] drm/amdgpu/pm: add missing revision check for CI Date: Fri, 15 May 2026 17:49:08 +0200 Message-ID: <20260515154700.170960436@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260515154657.309489048@linuxfoundation.org> References: <20260515154657.309489048@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.18-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 @@ -1326,8 +1326,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 =