]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/xe/guc_pc: Reorder forcewake in xe_guc_pc_fini_hw()
authorRaag Jadav <raag.jadav@intel.com>
Mon, 27 Apr 2026 09:29:27 +0000 (14:59 +0530)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Mon, 27 Apr 2026 22:13:16 +0000 (18:13 -0400)
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>
Link: https://patch.msgid.link/20260427092928.1181893-3-raag.jadav@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/xe/xe_guc_pc.c

index 9530cddbd11decc7b5ada4f7ffa68d15721c9017..59f2fa79ad422934561b3f4d97d3b4634bb6303b 100644 (file)
@@ -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)));
 }