Re: [PATCH v2 2/3] drm/xe/guc_pc: Reorder forcewake in xe_guc_pc_fini_hw()

Rodrigo Vivi
2026-04-27T22:08:25Z

On Mon, Apr 27, 2026 at 02:59:27PM +0530, Raag Jadav wrote:
> xe_guc_pc_stop() doesn't perform any MMIO operation that requires
> forcewake in it's code path. Move it before pc_set_cur_freq() which
> writes to RPNSWREQ and actually requires it.
>
> Signed-off-by: Raag Jadav <raag.jadav@intel.com>

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

> ---
> v2: Split forcewake reordering to separate patch (Rodrigo)
> ---
> drivers/gpu/drm/xe/xe_guc_pc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_guc_pc.c b/drivers/gpu/drm/xe/xe_guc_pc.c
> index 9530cddbd11d..59f2fa79ad42 100644
> --- a/drivers/gpu/drm/xe/xe_guc_pc.c
> +++ b/drivers/gpu/drm/xe/xe_guc_pc.c
> @@ -1340,10 +1340,10 @@ static void xe_guc_pc_fini_hw(void *arg)
> if (xe_device_wedged(xe))
> return;
>
> - CLASS(xe_force_wake, fw_ref)(gt_to_fw(pc_to_gt(pc)), XE_FW_GT);
> xe_guc_pc_stop(pc);
>
> /* Bind requested freq to mert_freq_cap before unload */
> + CLASS(xe_force_wake, fw_ref)(gt_to_fw(pc_to_gt(pc)), XE_FW_GT);
> pc_set_cur_freq(pc, min(pc_max_freq_cap(pc), xe_guc_pc_get_rpe_freq(pc)));
> }
>
> --
> 2.43.0
>