Re: [PATCH 6.11 01/31] drm/xe/migrate: Handle clear ccs logic for xe2 dgfx

[Sasha Levin <sashal@kernel.org>]

[ Sasha's backport helper bot ]

Hi,

The upstream commit SHA1 provided is correct: 108c972a11c5f6e37be58207460d9bcac06698db

WARNING: Author mismatch between patch and upstream commit:
Backport author: Lucas De Marchi <lucas.demarchi@intel.com>
Commit author: Akshata Jahagirdar <akshata.jahagirdar@intel.com>


Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.11.y | Not found

Note: The patch differs from the upstream commit:
---
--- -	2024-11-23 08:22:04.287621219 -0500
+++ /tmp/tmp.piLgrFj0iY	2024-11-23 08:22:04.278840217 -0500
@@ -1,3 +1,5 @@
+commit 108c972a11c5f6e37be58207460d9bcac06698db upstream.
+
 For Xe2 dGPU, we clear the bo by modifying the VRAM using an
 uncompressed pat index which then indirectly updates the
 compression status as uncompressed i.e zeroed CCS.
@@ -13,15 +15,16 @@
 Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
 Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
 Link: https://patchwork.freedesktop.org/patch/msgid/8dd869dd8dda5e17ace28c04f1a48675f5540874.1721250309.git.akshata.jahagirdar@intel.com
+Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
 ---
  drivers/gpu/drm/xe/xe_migrate.c | 11 ++++++++---
  1 file changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c
-index fa23a7e7ec435..85eec95c9bc27 100644
+index a849c48d8ac90..8315cb02f370d 100644
 --- a/drivers/gpu/drm/xe/xe_migrate.c
 +++ b/drivers/gpu/drm/xe/xe_migrate.c
-@@ -347,6 +347,11 @@ static u32 xe_migrate_usm_logical_mask(struct xe_gt *gt)
+@@ -348,6 +348,11 @@ static u32 xe_migrate_usm_logical_mask(struct xe_gt *gt)
  	return logical_mask;
  }
  
@@ -33,7 +36,7 @@
  /**
   * xe_migrate_init() - Initialize a migrate context
   * @tile: Back-pointer to the tile we're initializing for.
-@@ -420,7 +425,7 @@ struct xe_migrate *xe_migrate_init(struct xe_tile *tile)
+@@ -421,7 +426,7 @@ struct xe_migrate *xe_migrate_init(struct xe_tile *tile)
  		return ERR_PTR(err);
  
  	if (IS_DGFX(xe)) {
@@ -42,7 +45,7 @@
  			/* min chunk size corresponds to 4K of CCS Metadata */
  			m->min_chunk_size = SZ_4K * SZ_64K /
  				xe_device_ccs_bytes(xe, SZ_64K);
-@@ -1034,7 +1039,7 @@ struct dma_fence *xe_migrate_clear(struct xe_migrate *m,
+@@ -1035,7 +1040,7 @@ struct dma_fence *xe_migrate_clear(struct xe_migrate *m,
  					clear_system_ccs ? 0 : emit_clear_cmd_len(gt), 0,
  					avail_pts);
  
@@ -51,7 +54,7 @@
  			batch_size += EMIT_COPY_CCS_DW;
  
  		/* Clear commands */
-@@ -1062,7 +1067,7 @@ struct dma_fence *xe_migrate_clear(struct xe_migrate *m,
+@@ -1063,7 +1068,7 @@ struct dma_fence *xe_migrate_clear(struct xe_migrate *m,
  		if (!clear_system_ccs)
  			emit_clear(gt, bb, clear_L0_ofs, clear_L0, XE_PAGE_SIZE, clear_vram);
  
@@ -60,3 +63,6 @@
  			emit_copy_ccs(gt, bb, clear_L0_ofs, true,
  				      m->cleared_mem_ofs, false, clear_L0);
  			flush_flags = MI_FLUSH_DW_CCS;
+-- 
+2.47.0
+
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.11.y       |  Success    |  Success   |