Commit 2470b141 authored by Riana Tauro's avatar Riana Tauro Committed by Thomas Hellström
Browse files

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: 975e4a37 ("drm/xe: Manually setup C6 when skip_guc_pc is set")
Signed-off-by: default avatarRiana Tauro <riana.tauro@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240606100842.956072-3-riana.tauro@intel.com


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
(cherry picked from commit 6800e63c)
Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
parent b5e3a9b8

drivers/gpu/drm/xe/xe_gt_idle.c

+7 −0
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/xe/xe_guc_pc.c

+0 −6
Original line number Diff line number Diff line
@@ -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));