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 B8FF23B27E6 for ; Tue, 17 Mar 2026 11:33:35 +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=1773747215; cv=none; b=strWfw1YYFpmwFdWjB92muzguYProEite0VluMv2BBKOy9P5FFqCceaeSTHAWljv2vqFSL7fVm0LUod07OI4VJ/Maux+U+VBGqqqgXo7rbHGQhZyyVxRTq3CsTWr6K3heDOd1Idy+BY6O1o1DE582C6RvOuO5aHUp3gpYsSButo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773747215; c=relaxed/simple; bh=7lsPXJRxTqTngUfZxIsQW4wVDdd0ZISMPuGhaJO3TQI=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=rTsJep1FDfMWE0WaHxfQvC2+O3o0/zv2SvLJf0QR+9ybIMkQn+pjY87UbK/t+Cz4KT/e4Qqe6rVRMkN6cilOSmGvcElOMW3yE+Zewi8y5tRlH4sDKlRvKmno7azXZf3GO6+2KH1v6QQfXjm+ykAyauKU48TYhTAGMC76tlSDqw4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=nBAROtIH; 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="nBAROtIH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C86F1C4CEF7; Tue, 17 Mar 2026 11:33:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1773747215; bh=7lsPXJRxTqTngUfZxIsQW4wVDdd0ZISMPuGhaJO3TQI=; h=Subject:To:Cc:From:Date:From; b=nBAROtIH25RJ0NGOTngB9PRrxadensuDJzBTgw+nIe5pr29Fmn3nL4ITQNU0QMU+g FU+S73JHKpHDWv2u++FbWDfX+XlUxOGKn10ggZWY+3bLAej6hIXAeBRQybb49H79Al znNqyIIhITXyj5dpj66z6VQJlHiGg4EimhxANnz4= Subject: FAILED: patch "[PATCH] drm/i915/alpm: ALPM disable fixes" failed to apply to 6.12-stable tree To: jouni.hogander@intel.com,animesh.manna@intel.com,jani.nikula@linux.intel.com,joonas.lahtinen@linux.intel.com,michal.grzelak@intel.com,stable@vger.kernel.org Cc: From: Date: Tue, 17 Mar 2026 12:33:31 +0100 Message-ID: <2026031731-secret-rocket-af05@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.12-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.12.y git checkout FETCH_HEAD git cherry-pick -x eb4a7139e97374f42b7242cc754e77f1623fbcd5 # git commit -s git send-email --to '' --in-reply-to '2026031731-secret-rocket-af05@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From eb4a7139e97374f42b7242cc754e77f1623fbcd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20H=C3=B6gander?= Date: Thu, 12 Feb 2026 08:27:31 +0200 Subject: [PATCH] drm/i915/alpm: ALPM disable fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PORT_ALPM_CTL is supposed to be written only before link training. Remove writing it from ALPM disable. Also clearing ALPM_CTL_ALPM_AUX_LESS_ENABLE and is not about disabling ALPM but switching to AUX-Wake ALPM. Stop touching this bit on ALPM disable. Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/7153 Fixes: 1ccbf135862b ("drm/i915/psr: Enable ALPM on source side for eDP Panel replay") Cc: Animesh Manna Cc: Jani Nikula Cc: # v6.10+ Signed-off-by: Jouni Högander Reviewed-by: Michał Grzelak Link: https://patch.msgid.link/20260212062731.397801-1-jouni.hogander@intel.com (cherry picked from commit 008304c9ae75c772d3460040de56e12112cdf5e6) Signed-off-by: Joonas Lahtinen diff --git a/drivers/gpu/drm/i915/display/intel_alpm.c b/drivers/gpu/drm/i915/display/intel_alpm.c index 7ce8c674bb03..07ffee38974b 100644 --- a/drivers/gpu/drm/i915/display/intel_alpm.c +++ b/drivers/gpu/drm/i915/display/intel_alpm.c @@ -562,12 +562,7 @@ void intel_alpm_disable(struct intel_dp *intel_dp) mutex_lock(&intel_dp->alpm.lock); intel_de_rmw(display, ALPM_CTL(display, cpu_transcoder), - ALPM_CTL_ALPM_ENABLE | ALPM_CTL_LOBF_ENABLE | - ALPM_CTL_ALPM_AUX_LESS_ENABLE, 0); - - intel_de_rmw(display, - PORT_ALPM_CTL(cpu_transcoder), - PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE, 0); + ALPM_CTL_ALPM_ENABLE | ALPM_CTL_LOBF_ENABLE, 0); drm_dbg_kms(display->drm, "Disabling ALPM\n"); mutex_unlock(&intel_dp->alpm.lock);