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 0D88C2690D5; Sat, 30 May 2026 17:05:08 +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=1780160709; cv=none; b=Si8VAobeE7NaSXcG+1svCIXC4y2eTwOcGEYEgO8GrvhwnagbGeu8MOtaYe9ojygAChvM20U2aJLujnklZHHrl3NxA6rMOG8SuimOx6yvppMy/EfIoqZc0zst/34f8qXlt6EbBeKNz3/7MNkKVkQIvY+LhUTG3KQ4W9nv1CvobNI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780160709; c=relaxed/simple; bh=4ssjO6dTqZGLRxwSPZTTnHQcfpQUHjcce9FbXimD9cg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HXAk90GxpKVWGuxuo1bIi2a3cS2lhH00rFan95uQ5swRRytSIJDS8ewmhRVIi/kd3KM+5rZaymAXfOZzVCzheZy7XtgN+grPvTHsqepJlYE6gqiLM6oLSmWF7sOfpd7Q4mqc1Gtx/xXoGi/adXOC2v+w/x2KFLny2IoKGyxnifQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=MBANKJy4; 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="MBANKJy4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4BAFE1F00893; Sat, 30 May 2026 17:05:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780160707; bh=ySb5VL8RQgpm9p/yDb0SfEE4nAyhg0crI7Q65LLszHc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MBANKJy4t94GJijetzX8lBRlR5AUGtlOYGzVpCQSFRCrZNZRyazMJI4TdBQW5KyEs K4zB5bKjCHeLmBzfg7yWKbXYGL1+VeESC7hfGiO9oU/BabdmxPZg+tBvkWvmfS5MCB vBniWr4XMs609QnvfSxTCv9PY184EgrDNWAHem44= 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.1 413/969] drm/amdgpu/pm: add missing revision check for CI Date: Sat, 30 May 2026 17:58:57 +0200 Message-ID: <20260530160311.682388794@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@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 6.1-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 @@ -1327,8 +1327,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 =