NACK/Cmnt: [SRU][P:linux][PATCH 0/3] drm/xe: Lite restore breaks fdinfo drm-cycles-rcs reporting

[John Cabaj]

On 8/5/25 8:41 AM, Thibault Ferrante wrote:
> BugLink: https://bugs.launchpad.net/bugs/2119526
> 
> [ Impact ]
> 
>   * GPU usage reported wrongly.
>   * Upstream bug report: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/4532
> 
> [ Fix ]
> 
>   * Upstream fixes:
> 617d824c53 drm/xe: Add WA BB to capture active context utilization

This one doesn't cherry-pick cleanly for me:

$ git cherry-pick 617d824c5323b8474b3665ae6c410c98b839e0b0
Auto-merging drivers/gpu/drm/xe/regs/xe_engine_regs.h
Auto-merging drivers/gpu/drm/xe/xe_device_types.h
Auto-merging drivers/gpu/drm/xe/xe_exec_queue.c
Auto-merging drivers/gpu/drm/xe/xe_guc_submit.c
Auto-merging drivers/gpu/drm/xe/xe_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_lrc.c
Auto-merging drivers/gpu/drm/xe/xe_lrc.h
Auto-merging drivers/gpu/drm/xe/xe_lrc_types.h
Auto-merging drivers/gpu/drm/xe/xe_pci.c
Auto-merging drivers/gpu/drm/xe/xe_pci_types.h
error: could not apply 617d824c5323... drm/xe: Add WA BB to capture 
active context utilization

> 9c7632faad drm/xe/lrc: Use a temporary buffer for WA BB
> 741d3ef8b8 drm/xe: Save the gt pointer in lrc and drop the tile
> 
> [ Test Plan ]
> 
>   * Trigger 100% usage of GPU, check for usage.
> 
> [ Where problems could occur ]
> 
>   * Regression in drm/xe driver and GPU management.
> 
> [ Other Info ]
> 
>   * Tested and submitted by intel.
> 
> Lucas De Marchi (1):
>    drm/xe/lrc: Use a temporary buffer for WA BB
> 
> Umesh Nerlige Ramappa (2):
>    drm/xe: Add WA BB to capture active context utilization
>    drm/xe: Save the gt pointer in lrc and drop the tile
> 
>   drivers/gpu/drm/xe/regs/xe_engine_regs.h |   5 +
>   drivers/gpu/drm/xe/regs/xe_lrc_layout.h  |   2 +
>   drivers/gpu/drm/xe/xe_device_types.h     |   2 +
>   drivers/gpu/drm/xe/xe_exec_queue.c       |   2 +-
>   drivers/gpu/drm/xe/xe_guc_submit.c       |   2 +-
>   drivers/gpu/drm/xe/xe_lrc.c              | 213 +++++++++++++++++++++--
>   drivers/gpu/drm/xe/xe_lrc.h              |   5 +-
>   drivers/gpu/drm/xe/xe_lrc_types.h        |   9 +-
>   drivers/gpu/drm/xe/xe_pci.c              |   2 +
>   drivers/gpu/drm/xe/xe_pci_types.h        |   1 +
>   drivers/gpu/drm/xe/xe_trace_lrc.h        |   8 +-
>   11 files changed, 228 insertions(+), 23 deletions(-)
>