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 <riana.tauro@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240606100842.956072-3-riana.tauro@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
(cherry picked from commit 6800e63cf97bae62bca56d8e691544540d945f53)
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>

diff --git a/drivers/gpu/drm/xe/xe_gt_idle.c b/drivers/gpu/drm/xe/xe_gt_idle.c
index c699f47f4700da8375afb034961e8df603380144..944770fb2daff06543cd993b03b84f90c5187e22 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gt_idle.c
+++ b/drivers/gpu/drm/xe/xe_gt_idle.c
@@ -147,6 +147,13 @@ static const struct attribute *gt_idle_attrs[] = {
 static void gt_idle_sysfs_fini(struct drm_device *drm, void *arg)
 {
        struct kobject *kobj = arg;
+       struct xe_gt *gt = kobj_to_gt(kobj->parent);
+
+       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 509649d0e65e1c5aef5cc1518ca23335075fa4ab..23382ced4ea7471f860640937e9cd92e097ea0dc 100644 (file)
--- a/drivers/gpu/drm/xe/xe_guc_pc.c
+++ b/drivers/gpu/drm/xe/xe_guc_pc.c
@@ -895,12 +895,6 @@ int xe_guc_pc_stop(struct xe_guc_pc *pc)
 static void xe_guc_pc_fini(struct drm_device *drm, 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;
-       }
 
        XE_WARN_ON(xe_force_wake_get(gt_to_fw(pc_to_gt(pc)), XE_FORCEWAKE_ALL));
        XE_WARN_ON(xe_guc_pc_gucrc_disable(pc));