Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-xe] [PATCH] drm/xe: Check skip_guc_pc before disabling gucrc
@ 2023-12-05 23:20 Vinay Belgaumkar
  2023-12-06  5:51 ` [Intel-xe] ✓ CI.Patch_applied: success for drm/xe: Check skip_guc_pc before disabling gucrc (rev2) Patchwork
                   ` (14 more replies)
  0 siblings, 15 replies; 17+ messages in thread
From: Vinay Belgaumkar @ 2023-12-05 23:20 UTC (permalink / raw)
  To: intel-xe; +Cc: Rodrigo Vivi

Also, use the new C6 helper instead of duplicating that code.

v2: Check skip flag at the beginning of the function (Rodrigo)

Fixes: ff1db4de1e40 ("drm/xe: Manually setup C6 when skip_guc_pc is set")
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
---
 drivers/gpu/drm/xe/xe_guc_pc.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_guc_pc.c b/drivers/gpu/drm/xe/xe_guc_pc.c
index 1943893a3fd7..86124f55dbd3 100644
--- a/drivers/gpu/drm/xe/xe_guc_pc.c
+++ b/drivers/gpu/drm/xe/xe_guc_pc.c
@@ -794,9 +794,13 @@ static int pc_adjust_requested_freq(struct xe_guc_pc *pc)
  */
 int xe_guc_pc_gucrc_disable(struct xe_guc_pc *pc)
 {
+	struct xe_device *xe = pc_to_xe(pc);
 	struct xe_gt *gt = pc_to_gt(pc);
 	int ret = 0;
 
+	if (xe->info.skip_guc_pc)
+		return 0;
+
 	xe_device_mem_access_get(pc_to_xe(pc));
 
 	ret = pc_action_setup_gucrc(pc, XE_GUCRC_HOST_CONTROL);
@@ -807,9 +811,7 @@ int xe_guc_pc_gucrc_disable(struct xe_guc_pc *pc)
 	if (ret)
 		goto out;
 
-	xe_mmio_write32(gt, PG_ENABLE, 0);
-	xe_mmio_write32(gt, RC_CONTROL, 0);
-	xe_mmio_write32(gt, RC_STATE, 0);
+	xe_gt_idle_disable_c6(gt);
 
 	XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL));
 
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [Intel-xe] [PATCH] drm/xe: Check skip_guc_pc before disabling gucrc
@ 2023-12-01 20:33 Vinay Belgaumkar
  0 siblings, 0 replies; 17+ messages in thread
From: Vinay Belgaumkar @ 2023-12-01 20:33 UTC (permalink / raw)
  To: intel-xe

Also, use the new C6 helper instead of duplicating that code.

Fixes: ff1db4de1e40 ("drm/xe: Manually setup C6 when skip_guc_pc is set")
Signed-off-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
---
 drivers/gpu/drm/xe/xe_guc_pc.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_guc_pc.c b/drivers/gpu/drm/xe/xe_guc_pc.c
index 1943893a3fd7..8c559ff57e3d 100644
--- a/drivers/gpu/drm/xe/xe_guc_pc.c
+++ b/drivers/gpu/drm/xe/xe_guc_pc.c
@@ -794,22 +794,23 @@ static int pc_adjust_requested_freq(struct xe_guc_pc *pc)
  */
 int xe_guc_pc_gucrc_disable(struct xe_guc_pc *pc)
 {
+	struct xe_device *xe = pc_to_xe(pc);
 	struct xe_gt *gt = pc_to_gt(pc);
 	int ret = 0;
 
 	xe_device_mem_access_get(pc_to_xe(pc));
 
-	ret = pc_action_setup_gucrc(pc, XE_GUCRC_HOST_CONTROL);
-	if (ret)
-		goto out;
+	if (!xe->info.skip_guc_pc) {
+		ret = pc_action_setup_gucrc(pc, XE_GUCRC_HOST_CONTROL);
+		if (ret)
+			goto out;
+	}
 
 	ret = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
 	if (ret)
 		goto out;
 
-	xe_mmio_write32(gt, PG_ENABLE, 0);
-	xe_mmio_write32(gt, RC_CONTROL, 0);
-	xe_mmio_write32(gt, RC_STATE, 0);
+	xe_gt_idle_disable_c6(gt);
 
 	XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL));
 
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 17+ messages in thread
end of thread, other threads:[~2023-12-08  5:16 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-05 23:20 [Intel-xe] [PATCH] drm/xe: Check skip_guc_pc before disabling gucrc Vinay Belgaumkar
2023-12-06  5:51 ` [Intel-xe] ✓ CI.Patch_applied: success for drm/xe: Check skip_guc_pc before disabling gucrc (rev2) Patchwork
2023-12-06  5:51 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-12-06  5:52 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-12-06  6:00 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-12-06  6:00 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-12-06  6:01 ` [Intel-xe] ✓ CI.checksparse: " Patchwork
2023-12-06  6:37 ` [Intel-xe] ✗ CI.BAT: failure " Patchwork
2023-12-07  8:03 ` [Intel-xe] ✓ CI.Patch_applied: success for drm/xe: Check skip_guc_pc before disabling gucrc (rev3) Patchwork
2023-12-07  8:03 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-12-07  8:05 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-12-07  8:12 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-12-07  8:12 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-12-07  8:14 ` [Intel-xe] ✓ CI.checksparse: " Patchwork
2023-12-07  8:51 ` [Intel-xe] ✓ CI.BAT: " Patchwork
2023-12-08  5:15 ` [Intel-xe] [PATCH] drm/xe: Check skip_guc_pc before disabling gucrc Rodrigo Vivi
  -- strict thread matches above, loose matches on Subject: below --
2023-12-01 20:33 Vinay Belgaumkar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox