FAILED: patch "[PATCH] drm/xe: Ensure fixed_slice_mode gets set after ccs_mode" failed to apply to 6.14-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.14-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 <[email protected]>.
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.14.y
git checkout FETCH_HEAD
git cherry-pick -x 262de94a3a7ef23c326534b3d9483602b7af841e
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025042255-relight-tyke-0d59@gregkh' --subject-prefix 'PATCH 6.14.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 262de94a3a7ef23c326534b3d9483602b7af841e Mon Sep 17 00:00:00 2001
From: Niranjana Vishwanathapura <[email protected]>
Date: Thu, 27 Mar 2025 11:56:04 -0700
Subject: [PATCH] drm/xe: Ensure fixed_slice_mode gets set after ccs_mode
change
The RCU_MODE_FIXED_SLICE_CCS_MODE setting is not getting invoked in the gt reset path after the ccs_mode setting by the user. Add it to engine register update list (in hw_engine_setup_default_state()) which ensures it gets set in the gt reset and engine reset paths.
v2: Add register update to engine list to ensure it gets updated after engine reset also.
drivers/gpu/drm/xe/xe_hw_engine.c +6 -6
@@ -389,12 +389,6 @@ xe_hw_engine_setup_default_lrc_state(struct xe_hw_engine *hwe) blit_cctl_val, XE_RTP_ACTION_FLAG(ENGINE_BASE))) }, -/* Use Fixed slice CCS mode */ - {XE_RTP_NAME ("RCU_MODE_FIXED_SLICE_CCS_MODE" ), -XE_RTP_RULES (FUNC (xe_hw_engine_match_fixed_cslice_mode)), -XE_RTP_ACTIONS (FIELD_SET (RCU_MODE ,RCU_MODE_FIXED_SLICE_CCS_MODE , -RCU_MODE_FIXED_SLICE_CCS_MODE )) - },/* Disable WMTP if HW doesn't support it */ {XE_RTP_NAME ("DISABLE_WMTP_ON_UNSUPPORTED_HW" ), XE_RTP_RULES(FUNC(xe_rtp_cfeg_wmtp_disabled)),
@@ -461,6 +455,12 @@ hw_engine_setup_default_state(struct xe_hw_engine *hwe) XE_RTP_ACTIONS(SET(CSFE_CHICKEN1(0), CS_PRIORITY_MEM_READ, XE_RTP_ACTION_FLAG(ENGINE_BASE))) }, +/* Use Fixed slice CCS mode */ + {XE_RTP_NAME ("RCU_MODE_FIXED_SLICE_CCS_MODE" ), +XE_RTP_RULES (FUNC (xe_hw_engine_match_fixed_cslice_mode)), +XE_RTP_ACTIONS (FIELD_SET (RCU_MODE ,RCU_MODE_FIXED_SLICE_CCS_MODE , +RCU_MODE_FIXED_SLICE_CCS_MODE )) + }, };xe_rtp_process_to_sr (&ctx, engine_entries,ARRAY_SIZE (engine_entries), &hwe->reg_sr);