FAILED: patch "[PATCH] drm/xe: Ensure fixed_slice_mode gets set after ccs_mode" failed to apply to 6.12-stable tree

FAILED: patch "[PATCH] drm/xe: Ensure fixed_slice_mode gets set after ccs_mode" failed to apply to 6.12-stable tree

[gregkh]

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 <stable@vger.kernel.org>.

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 262de94a3a7ef23c326534b3d9483602b7af841e
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2025042256-unshackle-unwashed-bd50@gregkh' --subject-prefix 'PATCH 6.12.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 <niranjana.vishwanathapura@intel.com>
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.

Fixes: 0d97ecce16bd ("drm/xe: Enable Fixed CCS mode setting")
Cc: stable@vger.kernel.org
Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Link: https://lore.kernel.org/r/20250327185604.18230-1-niranjana.vishwanathapura@intel.com
(cherry picked from commit 12468e519f98e4d93370712e3607fab61df9dae9)
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_hw_engine.c b/drivers/gpu/drm/xe/xe_hw_engine.c
index 8c05fd30b7df..93241fd0a4ba 100644
--- a/drivers/gpu/drm/xe/xe_hw_engine.c
+++ b/drivers/gpu/drm/xe/xe_hw_engine.c
@@ -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);

[PATCH 6.12.y] drm/xe: Ensure fixed_slice_mode gets set after ccs_mode change

[Lucas De Marchi]

From: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>

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.

Fixes: 0d97ecce16bd ("drm/xe: Enable Fixed CCS mode setting")
Cc: stable@vger.kernel.org
Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Link: https://lore.kernel.org/r/20250327185604.18230-1-niranjana.vishwanathapura@intel.com
(cherry picked from commit 12468e519f98e4d93370712e3607fab61df9dae9)
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
(cherry picked from commit 262de94a3a7ef23c326534b3d9483602b7af841e)
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 drivers/gpu/drm/xe/xe_hw_engine.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_hw_engine.c b/drivers/gpu/drm/xe/xe_hw_engine.c
index b11bc0f00dfda..0248597c6269a 100644
--- a/drivers/gpu/drm/xe/xe_hw_engine.c
+++ b/drivers/gpu/drm/xe/xe_hw_engine.c
@@ -381,12 +381,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)),
@@ -454,6 +448,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))
+		},
 		{}
 	};
 
-- 
2.49.0

Re: [PATCH 6.12.y] drm/xe: Ensure fixed_slice_mode gets set after ccs_mode change

[Greg KH]

On Mon, May 05, 2025 at 09:13:17AM -0700, Lucas De Marchi wrote:
> From: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
> 
> 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.
> 
> Fixes: 0d97ecce16bd ("drm/xe: Enable Fixed CCS mode setting")
> Cc: stable@vger.kernel.org
> Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
> Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
> Signed-off-by: Matthew Brost <matthew.brost@intel.com>
> Link: https://lore.kernel.org/r/20250327185604.18230-1-niranjana.vishwanathapura@intel.com
> (cherry picked from commit 12468e519f98e4d93370712e3607fab61df9dae9)
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> (cherry picked from commit 262de94a3a7ef23c326534b3d9483602b7af841e)

Wrong git id, please use the git id that the original commit is in
Linus's tree, NOT the stable branch only.  Please fix and resend a v2.

thanks,

greg k-h

Re: [PATCH 6.12.y] drm/xe: Ensure fixed_slice_mode gets set after ccs_mode change

[Lucas De Marchi]

On Wed, May 07, 2025 at 11:25:20AM +0200, Greg KH wrote:
>On Mon, May 05, 2025 at 09:13:17AM -0700, Lucas De Marchi wrote:
>> From: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
>>
>> 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.
>>
>> Fixes: 0d97ecce16bd ("drm/xe: Enable Fixed CCS mode setting")
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
>> Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
>> Signed-off-by: Matthew Brost <matthew.brost@intel.com>
>> Link: https://lore.kernel.org/r/20250327185604.18230-1-niranjana.vishwanathapura@intel.com
>> (cherry picked from commit 12468e519f98e4d93370712e3607fab61df9dae9)
>> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
>> (cherry picked from commit 262de94a3a7ef23c326534b3d9483602b7af841e)
>
>Wrong git id, please use the git id that the original commit is in
>Linus's tree, NOT the stable branch only.  Please fix and resend a v2.

It's the same old issue "it's a cherry-pick of a cherry-pick".
262de94a3a7ef23c326534b3d9483602b7af841e is exactly what reached Linus's
tree:

	$ git tag --contains 262de94a3a7ef23c326534b3d9483602b7af841e 'v6.*'
	v6.15-rc2
	v6.15-rc3
	v6.15-rc4
	v6.15-rc5

and what was in your instructions in
2025042256-unshackle-unwashed-bd50@gregkh :

	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 262de94a3a7ef23c326534b3d9483602b7af841e
	# <resolve conflicts, build, test, etc.>
	git commit -s
	git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2025042256-unshackle-unwashed-bd50@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..

Looking at linux-6.12.y for other cases:
a43e53e310a4bba252a3f8d1500f123a23e9a009 for example. I thought about
going ahead and doing the "commit XXXXX upstream.", but then it could
break on your side because the last "cherry picked from"  doesn't match.


Lucas De Marchi


>
>thanks,
>
>greg k-h

Re: [PATCH 6.12.y] drm/xe: Ensure fixed_slice_mode gets set after ccs_mode change

[Greg KH]

On Wed, May 07, 2025 at 08:58:27AM -0500, Lucas De Marchi wrote:
> On Wed, May 07, 2025 at 11:25:20AM +0200, Greg KH wrote:
> > On Mon, May 05, 2025 at 09:13:17AM -0700, Lucas De Marchi wrote:
> > > From: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
> > > 
> > > 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.
> > > 
> > > Fixes: 0d97ecce16bd ("drm/xe: Enable Fixed CCS mode setting")
> > > Cc: stable@vger.kernel.org
> > > Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
> > > Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
> > > Signed-off-by: Matthew Brost <matthew.brost@intel.com>
> > > Link: https://lore.kernel.org/r/20250327185604.18230-1-niranjana.vishwanathapura@intel.com
> > > (cherry picked from commit 12468e519f98e4d93370712e3607fab61df9dae9)
> > > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> > > (cherry picked from commit 262de94a3a7ef23c326534b3d9483602b7af841e)
> > 
> > Wrong git id, please use the git id that the original commit is in
> > Linus's tree, NOT the stable branch only.  Please fix and resend a v2.
> 
> It's the same old issue "it's a cherry-pick of a cherry-pick".
> 262de94a3a7ef23c326534b3d9483602b7af841e is exactly what reached Linus's
> tree:
> 
> 	$ git tag --contains 262de94a3a7ef23c326534b3d9483602b7af841e 'v6.*'
> 	v6.15-rc2
> 	v6.15-rc3
> 	v6.15-rc4
> 	v6.15-rc5
> 
> and what was in your instructions in
> 2025042256-unshackle-unwashed-bd50@gregkh :
> 
> 	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 262de94a3a7ef23c326534b3d9483602b7af841e
> 	# <resolve conflicts, build, test, etc.>
> 	git commit -s
> 	git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2025042256-unshackle-unwashed-bd50@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
> 
> Looking at linux-6.12.y for other cases:
> a43e53e310a4bba252a3f8d1500f123a23e9a009 for example. I thought about
> going ahead and doing the "commit XXXXX upstream.", but then it could
> break on your side because the last "cherry picked from"  doesn't match.

Argh, this is my fault, sorry.  I hadn't updated my local database of
commits for -rc2 or -rc3 and so this showed up as not being in anything
but a stable release.

I'll go take this now, sorry.  And yes, this "cherry pick" double stuff
is crazy, and really is a pain for everyone on our end, hopefully one
day it stops...

greg k-h