diff options
| -rw-r--r-- | drivers/gpu/drm/xe/xe_gt_idle.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_guc_pc.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/drm/xe/xe_gt_idle.c b/drivers/gpu/drm/xe/xe_gt_idle.c index a6ab8bb4571d..5d6181117ab2 100644 --- a/drivers/gpu/drm/xe/xe_gt_idle.c +++ b/drivers/gpu/drm/xe/xe_gt_idle.c @@ -197,6 +197,12 @@ static void gt_idle_fini(void *arg) xe_gt_idle_disable_pg(gt); + if (gt_to_xe(gt)->info.skip_guc_pc) { + XE_WARN_ON(xe_force_wake_get(gt_to_fw(gt), XE_FW_GT)); + xe_gt_idle_disable_c6(gt); + xe_force_wake_put(gt_to_fw(gt), XE_FW_GT); + } + sysfs_remove_files(kobj, gt_idle_attrs); kobject_put(kobj); } diff --git a/drivers/gpu/drm/xe/xe_guc_pc.c b/drivers/gpu/drm/xe/xe_guc_pc.c index 8187dfb2ad6c..508f0d39b4ad 100644 --- a/drivers/gpu/drm/xe/xe_guc_pc.c +++ b/drivers/gpu/drm/xe/xe_guc_pc.c @@ -897,11 +897,6 @@ static void xe_guc_pc_fini_hw(void *arg) struct xe_guc_pc *pc = arg; struct xe_device *xe = pc_to_xe(pc); - if (xe->info.skip_guc_pc) { - xe_gt_idle_disable_c6(pc_to_gt(pc)); - return; - } - if (xe_device_wedged(xe)) return; |