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 5F368534451 for ; Wed, 9 Sep 2026 11:49:40 +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=1788954581; cv=none; b=GNo3Rr34KKRbndFKnp9t7QyQhesAvUpbyY+HTNkwMz2q9R+yS3VbBPNkJ7B/eLVApFUus3lmaMFGMBS8Kni78YLIfBm6G/hSvLQGHFH+msrSAMhYdjiAHJ/Ks1s8CUTbAIjsVChYVEFx12WgpdtOSfiVayCdTckmNvmZPQYK0sg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788954581; c=relaxed/simple; bh=P/4Efo6iZrbM5StXBWgrT2A1B0bY/k8DihDfL8yQq5Y=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=rxSX+C0EXYlcn51vK7xAVCm0/nHQy4dZm+o/m/Ha8nW8jUliHp+3FudLwLW82yeI/lOynDe1nMuz5Qi56DKbdAGntY348S6do7+3v4dsuoIjjF5YaBnUThNPXgnF9nwQvjVS2Y3HAuGomdvDMVtee+Q6OIbZSKLygpO7CXANJJw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vdVw0Y48; 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="vdVw0Y48" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BA3B21F00A3D; Wed, 9 Sep 2026 11:49:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788954580; bh=bdgvg/VdODD427slYK8nywpLUw7HWu3kVJ6xITi4tlw=; h=Subject:To:Cc:From:Date; b=vdVw0Y48mv0zwEJwAFYpKNJsdVRPAleZenL4ZnXtzXMjffjbu60sW5JIf2VwDfvPy 1WiYgeVjwr9siynl4k2QgkdT05dDI+3Yazsgd2kQpsMKfK16xKVZrKCWUhKHNZwT6S OgH5g0128js0H+kY1nUP62DW0R1OrixHPjV/jLIo= Subject: FAILED: patch "[PATCH] drm/xe/rtp: Keep track of non-OA nonpriv slots" failed to apply to 6.18-stable tree To: ashutosh.dixit@intel.com,umesh.nerlige.ramappa@intel.com Cc: From: Date: Wed, 09 Sep 2026 13:37:00 +0200 Message-ID: <2026090959-patronize-cranium-6e85@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.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 15739920b71ef3c56868973b4e7e3164a793d09d # git commit -s git send-email --to '' --in-reply-to '2026090959-patronize-cranium-6e85@gregkh' --subject-prefix 'PATCH 6.18.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 15739920b71ef3c56868973b4e7e3164a793d09d Mon Sep 17 00:00:00 2001 From: Ashutosh Dixit Date: Mon, 15 Jun 2026 15:42:21 -0700 Subject: [PATCH] drm/xe/rtp: Keep track of non-OA nonpriv slots In order to dynamically whitelist/dewhitelist OA registers on OA stream open/close, we need to keep track of nonpriv slots occupied by non-OA register whitelists. 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-4-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 6d642c2f6fd7..b5ae7d26e5ba 100644 --- a/drivers/gpu/drm/xe/xe_reg_whitelist.c +++ b/drivers/gpu/drm/xe/xe_reg_whitelist.c @@ -161,7 +161,7 @@ static const struct xe_rtp_table_sr oa_whitelist = XE_RTP_TABLE_SR( }, ); -static void whitelist_apply_to_hwe(struct xe_hw_engine *hwe) +static int whitelist_apply_to_hwe(struct xe_hw_engine *hwe) { struct xe_reg_sr *sr = &hwe->reg_whitelist; struct xe_reg_sr_entry *entry; @@ -193,6 +193,8 @@ static void whitelist_apply_to_hwe(struct xe_hw_engine *hwe) slot++; } + + return slot; } /** @@ -206,9 +208,10 @@ static void whitelist_apply_to_hwe(struct xe_hw_engine *hwe) void xe_reg_whitelist_process_engine(struct xe_hw_engine *hwe) { struct xe_rtp_process_ctx ctx = XE_RTP_PROCESS_CTX_INITIALIZER(hwe); + int first_oa_slot; xe_rtp_process_to_sr(&ctx, ®ister_whitelist, &hwe->reg_whitelist, false); - whitelist_apply_to_hwe(hwe); + first_oa_slot = whitelist_apply_to_hwe(hwe); xe_rtp_process_to_sr(&ctx, &oa_whitelist, &hwe->oa_whitelist, false); }