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 61DF84A3D54 for ; Wed, 9 Sep 2026 11:49:57 +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=1788954598; cv=none; b=dW4Mf6u18UXYsKdqrcNwlxDFQkByXJsmpLTdSOfUfdzwVzz0n7E1ji3ssDu3Muy5HIJD4hvozhUszLzq6gm9PZ+CSX96lRiGNmH3KeaPqOBAT9GlEbNAqWkU5CWbuX48riO02iTc9KgObenF/zyVD7OK+wRkIW7VbQQbWGUWh5o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788954598; c=relaxed/simple; bh=Lws6++nY6RPsZU6XZAMGN18i58HLSgSHvmQ0pRXthrc=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=ge1yaRJjXXAjWVeJuroV/QimWM9Dn8pPHM1WVFJyYmOV5BgA15vFzDu2tuqhjQh6bM8tvizCAjWClpIfagAzRtTIHPMMDuJnT5qMiY9+OpQga9HXOHoZzcWBlVytxf4FpX0zhVVYpKmAM+z1c/yRQtzCs5+PjqFk2PscLJK8RQU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=npUieFNb; 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="npUieFNb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BC67C1F00A3A; Wed, 9 Sep 2026 11:49:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788954597; bh=nUyx92PVS2OM9LolS7yheYC7eb2WdNWlqvSO7uL37JA=; h=Subject:To:Cc:From:Date; b=npUieFNbVFEfMbqBd6mOHBtshw0R8dX5EOvPopmn+TTxJyy6YwWY9FSOlUz5pw5du +12Q9IzR7jbMs/gyfuyuqN/VXRn1bW9FGsyS7epTawrwhSRQrTnUynsVpGCduxoGXZ rW6v2STgU3zCmL3JYADTX2E9QdPm8V7JZbye8tSM= Subject: FAILED: patch "[PATCH] drm/xe/rtp: Save OA nonpriv registers to register" failed to apply to 6.12-stable tree To: ashutosh.dixit@intel.com,umesh.nerlige.ramappa@intel.com Cc: From: Date: Wed, 09 Sep 2026 13:37:15 +0200 Message-ID: <2026090915-identity-phoenix-1160@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=ANSI_X3.4-1968 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 3a3c3e56db2923daaf1a5353cd6463a4cdaf4ffa # git commit -s git send-email --to '' --in-reply-to '2026090915-identity-phoenix-1160@gregkh' --subject-prefix 'PATCH 6.12.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 3a3c3e56db2923daaf1a5353cd6463a4cdaf4ffa Mon Sep 17 00:00:00 2001 From: Ashutosh Dixit Date: Mon, 15 Jun 2026 15:42:23 -0700 Subject: [PATCH] drm/xe/rtp: Save OA nonpriv registers to register save/restore lists Now we can save OA whitelisting nonpriv registers to register save/restore lists. OA nonpriv registers are saved to both hwe->oa_sr as well as hwe->reg_sr. During probe, resume and gt-reset flows KMD will apply hwe->reg_sr, ensuring OA registers are de-whitelisted after these events. For engine-reset, hwe->reg_sr is registered with GuC and GuC will apply these registers, ensuring OA registers are de-whitelisted after engine resets. hwe->oa_sr is used for whitelisting or de-whitelisting OA registers during OA operation, by toggling the 'deny' bit on oa stream open/close. Fixes: 828a8eaf37c3 ("drm/xe/oa: Add MMIO trigger support") Cc: stable@vger.kernel.org # v6.12+ Signed-off-by: Ashutosh Dixit Reviewed-by: Umesh Nerlige Ramappa Link: https://patch.msgid.link/20260615224227.34880-6-ashutosh.dixit@intel.com diff --git a/drivers/gpu/drm/xe/xe_reg_whitelist.c b/drivers/gpu/drm/xe/xe_reg_whitelist.c index e9d0a0b82527..76ac23644a4d 100644 --- a/drivers/gpu/drm/xe/xe_reg_whitelist.c +++ b/drivers/gpu/drm/xe/xe_reg_whitelist.c @@ -215,6 +215,18 @@ void xe_reg_whitelist_process_engine(struct xe_hw_engine *hwe) first_oa_slot = whitelist_apply_to_hwe(hwe, &hwe->reg_whitelist, &hwe->reg_sr, 0); xe_rtp_process_to_sr(&ctx, &oa_whitelist, &hwe->oa_whitelist, false); + + /* + * Save oa nonpriv registers to hwe->oa_sr, from which oa registers are whitelisted + * or de-whitelisted, by toggling the 'deny' bit on oa stream open/close + */ + whitelist_apply_to_hwe(hwe, &hwe->oa_whitelist, &hwe->oa_sr, first_oa_slot); + + /* + * Also save oa nonpriv registers to hwe->reg_sr, to ensure oa registers are not + * whitelisted by default after probe, gt reset, resume and engine reset + */ + whitelist_apply_to_hwe(hwe, &hwe->oa_whitelist, &hwe->reg_sr, first_oa_slot); } /**