Re: [PATCH 6.14.y] drm/xe/gsc: do not flush the GSC worker from the reset path

[Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>]

Hi,

On 5/14/2025 1:13 PM, Sasha Levin wrote:
> [ Sasha's backport helper bot ]
>
> Hi,
>
> Summary of potential issues:
> ⚠️ Found matching upstream commit but patch is missing proper reference to it

Not sure what the issue is here, the patch does have a "cherry picked 
from" line with the correct commit, as seen in the diff below. Do I need 
to add something else?

Thanks,
Daniele

>
> Found matching upstream commit: 03552d8ac0afcc080c339faa0b726e2c0e9361cb
>
> Note: The patch differs from the upstream commit:
> ---
> 1:  03552d8ac0afc ! 1:  ec3abfe7a63b2 drm/xe/gsc: do not flush the GSC worker from the reset path
>      @@ Commit message
>           Link: https://lore.kernel.org/r/20250502155104.2201469-1-daniele.ceraolospurio@intel.com
>           (cherry picked from commit 12370bfcc4f0bdf70279ec5b570eb298963422b5)
>           Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
>      +    (cherry picked from commit 03552d8ac0afcc080c339faa0b726e2c0e9361cb)
>       
>        ## drivers/gpu/drm/xe/xe_gsc.c ##
>      -@@ drivers/gpu/drm/xe/xe_gsc.c: void xe_gsc_wait_for_worker_completion(struct xe_gsc *gsc)
>      - 		flush_work(&gsc->work);
>      +@@ drivers/gpu/drm/xe/xe_gsc.c: void xe_gsc_remove(struct xe_gsc *gsc)
>      + 	xe_gsc_proxy_remove(gsc);
>        }
>        
>       +void xe_gsc_stop_prepare(struct xe_gsc *gsc)
>      @@ drivers/gpu/drm/xe/xe_gsc.h: struct xe_hw_engine;
>        void xe_gsc_wait_for_worker_completion(struct xe_gsc *gsc);
>       +void xe_gsc_stop_prepare(struct xe_gsc *gsc);
>        void xe_gsc_load_start(struct xe_gsc *gsc);
>      + void xe_gsc_remove(struct xe_gsc *gsc);
>        void xe_gsc_hwe_irq_handler(struct xe_hw_engine *hwe, u16 intr_vec);
>      -
>       
>        ## drivers/gpu/drm/xe/xe_gsc_proxy.c ##
>       @@ drivers/gpu/drm/xe/xe_gsc_proxy.c: bool xe_gsc_proxy_init_done(struct xe_gsc *gsc)
>      @@ drivers/gpu/drm/xe/xe_gsc_proxy.c: bool xe_gsc_proxy_init_done(struct xe_gsc *gs
>       
>        ## drivers/gpu/drm/xe/xe_gsc_proxy.h ##
>       @@ drivers/gpu/drm/xe/xe_gsc_proxy.h: struct xe_gsc;
>      -
>        int xe_gsc_proxy_init(struct xe_gsc *gsc);
>        bool xe_gsc_proxy_init_done(struct xe_gsc *gsc);
>      + void xe_gsc_proxy_remove(struct xe_gsc *gsc);
>       +int xe_gsc_wait_for_proxy_init_done(struct xe_gsc *gsc);
>        int xe_gsc_proxy_start(struct xe_gsc *gsc);
>        
>      @@ drivers/gpu/drm/xe/xe_uc.h: int xe_uc_reset_prepare(struct xe_uc *uc);
>       +void xe_uc_suspend_prepare(struct xe_uc *uc);
>        int xe_uc_suspend(struct xe_uc *uc);
>        int xe_uc_sanitize_reset(struct xe_uc *uc);
>      - void xe_uc_declare_wedged(struct xe_uc *uc);
>      + void xe_uc_remove(struct xe_uc *uc);
> ---
>
> Results of testing on various branches:
>
> | Branch                    | Patch Apply | Build Test |
> |---------------------------|-------------|------------|
> | stable/linux-6.14.y       |  Success    |  Success   |