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 2AFD54204E; Sun, 7 Jun 2026 10:54:48 +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=1780829689; cv=none; b=XQU1ALazGt0IBUkTFothaaI4/Zm/w54U6LKDnvW24s0GnKnqfWpOV43tGcquB2e4Zuu5uQTKI8T8XsdfHh3M7pqdBc/xrELs+D8mvcfDSfU39269nyanFCTOCw55pb1ZQ6A7ElgpRpbhN8AnnFHwDZQCgsGh2Jc6O7ZvqHQtWBk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780829689; c=relaxed/simple; bh=wxlllxzmLH1Mkv1gTFI4N5X6r6cBhP49dCjJJPQm+64=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sNLhYX+uY614X+EnsQ10ptVUDg8x7NjpEbZBsNV6fOPYQkjz6qp/fDGCECM2ou4xr/y6v+DJ2wJqohcXrBHaBIj+5sbtP3D2xuSKcolEF7ac+SE1r9hadubIsPJHKkq3c3SuhibEourlUaiZ+lWPpJ7ZLTMd++yeVYd1aLrqQaw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1mc5JITx; 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="1mc5JITx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 348D61F00893; Sun, 7 Jun 2026 10:54:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780829688; bh=DTBUj+PzswKO0n+RQduS7DfjjcaIqHd3pOhFhOe6kcc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=1mc5JITxS9jnL8Uj3y0xWfbIJ67VRJxRiBBHMG/0ncdGrSixpNyqG86iqod4wtPxn zFzzALuBMAqShFLWgq4K91PXfq1dkrRKUDCz0Bt9QBOhgKHlHofg/riBOxUemeKSjb kk4P3s9W/EIhAeWS+1o3Ca4X3GuWUv8O2dAGFk84= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alex Deucher , Jeremy Klarenbeek , =?UTF-8?q?Timur=20Krist=C3=B3f?= Subject: [PATCH 6.12 246/307] drm/amd/pm/si: Disregard vblank time when no displays are connected Date: Sun, 7 Jun 2026 12:00:43 +0200 Message-ID: <20260607095736.732725496@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260607095727.647295505@linuxfoundation.org> References: <20260607095727.647295505@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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Timur Kristóf commit dd4f3ee535b3b0ac027f75dbf9dc5fc88733c765 upstream. When no displays are connected, there is no vblank happening so the power management code shouldn't worry about it. This fixes a regression that caused the memory clock to be stuck at maximum when there were no displays connected to a SI GPU. Fixes: 9003a0746864 ("drm/amd/pm: Treat zero vblank time as too short in si_dpm (v3)") Fixes: 9d73b107a61b ("drm/amd/pm: Use pm_display_cfg in legacy DPM (v2)") Reviewed-by: Alex Deucher Tested-by: Jeremy Klarenbeek Signed-off-by: Timur Kristóf Signed-off-by: Alex Deucher (cherry picked from commit 6d87e0199f7b83735b56e422d59f170a201897a8) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +++ b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c @@ -3062,6 +3062,10 @@ static bool si_dpm_vblank_too_short(void /* we never hit the non-gddr5 limit so disable it */ u32 switch_limit = adev->gmc.vram_type == AMDGPU_VRAM_TYPE_GDDR5 ? 450 : 0; + /* Disregard vblank time when there are no displays connected */ + if (!adev->pm.pm_display_cfg.num_display) + return false; + /* Consider zero vblank time too short and disable MCLK switching. * Note that the vblank time is set to maximum when no displays are attached, * so we'll still enable MCLK switching in that case.