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 8428B448CFD for ; Wed, 29 Jul 2026 12:48:42 +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=1785329323; cv=none; b=SH9rYmhI1mUn4A5472UEZcKsjo8WhLPY3ivWFLyDyACZtDeUxickxATXMvA6KERsrY57gANp/BJZNGyfhqTESTEYVvxb9WyE99M193NpSdfMG28irQ4EunZo15OjwG7Cb4jXRZB7yaqTJ4DjmMtHURftpdF7fWAnNQOsZS5Gmes= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785329323; c=relaxed/simple; bh=kT/fVZ/jncDa1rBgX04lH5bykTBoJleQ03f2BwtBUb0=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=eH49Nwpt6wvlwsNWP0i2IW1EtWUyFbZncn2vxCPUppKXJVwDuR0gGO2+U7GhPR7q/T7qgZ5Ipu8w+o+NGId78G6Hz7175th2ug6HspAcL1AsaK1XquAEfH/ndyxxPxD/NzO2pOftrCf6nxvaduCXaI+qHpexzfc98BRG2tR875I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Q+JWWhNI; 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="Q+JWWhNI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D22351F000E9; Wed, 29 Jul 2026 12:48:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1785329322; bh=4uTdLTX68kIF/lWqmvGer/Oni4LT1n5Rn8qCBQd2I4U=; h=Subject:To:Cc:From:Date; b=Q+JWWhNIciKxelNIsqgyflkdLMCJMs5UVjTkUOdnvWMiVb/Mfd7qQ4IFlTPRXne7r 8W4tXXwRz/y+hviH9jSZnoP6kHqWVaME0dhIbQ1MiMSzPbealzUXGA/OqxA3ul1Pl1 WSwDtywDRbJZamSRkhp0Dr/ygRj1PRI2flTC5+tU= Subject: FAILED: patch "[PATCH] drm/amd/display: Set native cursor mode for disabled CRTCs" failed to apply to 6.18-stable tree To: timur.kristof@gmail.com,alexander.deucher@amd.com,michel.daenzer@mailbox.org,sunpeng.li@amd.com,viktor_jaegerskuepper@freenet.de Cc: From: Date: Wed, 29 Jul 2026 14:48:17 +0200 Message-ID: <2026072917-crawlers-zone-9149@gregkh> 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 The patch below does not apply to the 6.18-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y git checkout FETCH_HEAD git cherry-pick -x cea54c52d82dd9948126b7518af51ca1de094933 # git commit -s git send-email --to '' --in-reply-to '2026072917-crawlers-zone-9149@gregkh' --subject-prefix 'PATCH 6.18.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From cea54c52d82dd9948126b7518af51ca1de094933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Sat, 11 Jul 2026 13:34:35 +0200 Subject: [PATCH] drm/amd/display: Set native cursor mode for disabled CRTCs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Always set native cursor mode when the CRTC is disabled, to make sure it doesn't cause atomic commits to fail when they are trying to disable the CRTC. Fixes: 41af6215cdbc ("drm/amd/display: Reject cursor plane on DCE when scaled differently than primary") Closes: https://gitlab.freedesktop.org/drm/amd/-/work_items/5432 Cc: Leo Li Cc: Michel Dänzer Signed-off-by: Timur Kristóf Tested-by: Viktor Jägersküpper Signed-off-by: Alex Deucher (cherry picked from commit 2f79f0130f828cf26fe2dcf45291821616af7b47) Cc: stable@vger.kernel.org diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index ff337de44f7a..fe6eea28d119 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -12814,10 +12814,15 @@ static int dm_crtc_get_cursor_mode(struct amdgpu_device *adev, /* Overlay cursor not supported on HW before DCN * DCN401/420 does not have the cursor-on-scaled-plane or cursor-on-yuv-plane restrictions * as previous DCN generations, so enable native mode on DCN401/420 + * + * Always set native cursor mode when the CRTC is disabled, + * to make sure it doesn't cause atomic commits to fail when + * they are trying to disable the CRTC. */ if (amdgpu_ip_version(adev, DCE_HWIP, 0) == IP_VERSION(4, 0, 1) || amdgpu_ip_version(adev, DCE_HWIP, 0) == IP_VERSION(4, 2, 0) || - amdgpu_ip_version(adev, DCE_HWIP, 0) == IP_VERSION(4, 2, 1)) { + amdgpu_ip_version(adev, DCE_HWIP, 0) == IP_VERSION(4, 2, 1) || + !dm_crtc_state->base.enable) { *cursor_mode = DM_CURSOR_NATIVE_MODE; return 0; }