drm/xe: move disable_c6 call

disable c6 called in guc_pc_fini_hw is unreachable.

GuC PC init returns earlier if skip_guc_pc is true and never
registers the finish call thus making disable_c6 unreachable.

move this call to gt idle.

v2: rebase
v3: add fixes tag (Himal)

Fixes: 975e4a3795d4 ("drm/xe: Manually setup C6 when skip_guc_pc is set")
Signed-off-by: Riana Tauro <[email protected]>
Reviewed-by: Rodrigo Vivi <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Signed-off-by: Rodrigo Vivi <[email protected]>

diff --git a/drivers/gpu/drm/xe/xe_gt_idle.c b/drivers/gpu/drm/xe/xe_gt_idle.c
index a6ab8bb4571d639dae66b7c591ef9ba5dd5cdccb..5d6181117ab262511c815773e54828de1d6fc358 100644 (file)
--- 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 8187dfb2ad6ca184a421f4bc475ed8700295ad52..508f0d39b4ad57fef1e3b54d89e4a823697d242a 100644 (file)
--- 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;