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 78097318ED6; Wed, 20 May 2026 18:35:01 +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=1779302102; cv=none; b=s3qzeCLsH2+NitH7kYH9AIf2s8YiN8mr4nEN1Dlp9MrOtSEccx4GYBJ+ytVcKJL09OhiWN7aPlC1rmmd0lGmiyZj0vhXkdOlZ5sGnb8jWPULlSPYRsHeOc/5xcexFIRx/DUIwz4Y6G/NPc0qbByVALNGUJHTnA5bllWLl6ZQXp4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779302102; c=relaxed/simple; bh=v6U7TN7LVqlrVJHkBbPEXDlgeGjS81h3V2bw0QNRGm8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=U3yEjV3XIPrLUFwzcQj+l8OfHhaJrbbj0aewBPcHGkRPnS+XA8GgnR/yPVWSxv+OSJNjFUmi60E4uVCWpxzEHLHa32IrrOy87r5wDcMbnGQssUJYvBD3VLLNx3OEQxQAafle7Kph2BOvj8V8gQvgeXlwBFn5FzhIaFZnNtlxwQk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=MiWbdC+F; 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="MiWbdC+F" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEBD51F00893; Wed, 20 May 2026 18:35:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779302101; bh=0qr2vDB4tgxIjm+eEOFf7dbZTHU0IPMBPKKDzzd1ss4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MiWbdC+FThrsU7Hy09JKVCrx4odswa86D12Gi11Jpw4fl0Rzzy5tq58BSjeTzHnHS qqwjFItFF+3dRAcR/Jc7pTavfI1HA59uV8xo1w9KSRBg3ampDcu9MkeWTAzvHkfoLR fNEk8p5daNfACXwREgSE1in261/k1bFkAQOcCjms= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Timur=20Krist=C3=B3f?= , Alex Deucher , Sasha Levin Subject: [PATCH 6.6 122/508] drm/amd/pm/ci: Use highest MCLK on CI when MCLK DPM is disabled Date: Wed, 20 May 2026 18:19:05 +0200 Message-ID: <20260520162101.272519944@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162058.573354582@linuxfoundation.org> References: <20260520162058.573354582@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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Timur Kristóf [ Upstream commit 894f0d34d66cb47fe718fe2ae5c18729d22c5218 ] When MCLK DPM is disabled for any reason, populate the MCLK table with the highest MCLK DPM level, so that the ASIC can use the highest possible memory clock to get good performance even when MCLK DPM is disabled. Fixes: 9f4b35411cfe ("drm/amd/powerplay: add CI asics support to smumgr (v3)") Signed-off-by: Timur Kristóf Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c index 23f991dd065f3..fa9ab4144d308 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c +++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c @@ -1322,6 +1322,14 @@ static int ci_populate_all_memory_levels(struct pp_hwmgr *hwmgr) return result; } + if (data->mclk_dpm_key_disabled && dpm_table->mclk_table.count) { + /* Populate the table with the highest MCLK level when MCLK DPM is disabled */ + for (i = 0; i < dpm_table->mclk_table.count - 1; i++) { + levels[i] = levels[dpm_table->mclk_table.count - 1]; + levels[i].DisplayWatermark = PPSMC_DISPLAY_WATERMARK_HIGH; + } + } + smu_data->smc_state_table.MemoryLevel[0].EnabledForActivity = 1; dev_id = adev->pdev->device; -- 2.53.0