[Intel-gfx] [PATCH v2 4/5] drm/i915: Use the new gt_to_guc() wrapper

[Andi Shyti]

Get the guc reference from the gt using the gt_to_guc() helper.

Signed-off-by: Andi Shyti <andi.sh...@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_debugfs_params.c               | 5 +++--
 drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs_params.c 
b/drivers/gpu/drm/i915/i915_debugfs_params.c
index 614bde321589..8a385c57c0fe 100644
--- a/drivers/gpu/drm/i915/i915_debugfs_params.c
+++ b/drivers/gpu/drm/i915/i915_debugfs_params.c
@@ -38,10 +38,11 @@ static int i915_param_int_open(struct inode *inode, struct 
file *file)
 
 static int notify_guc(struct drm_i915_private *i915)
 {
+       struct intel_gt *gt = to_gt(i915);
        int ret = 0;
 
-       if (intel_uc_uses_guc_submission(&to_gt(i915)->uc))
-               ret = intel_guc_global_policies_update(&to_gt(i915)->uc.guc);
+       if (intel_uc_uses_guc_submission(&gt->uc))
+               ret = intel_guc_global_policies_update(gt_to_guc(gt));
 
        return ret;
 }
diff --git a/drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c 
b/drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c
index 2990dd4d4a0d..d9d8f0336702 100644
--- a/drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c
+++ b/drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c
@@ -65,7 +65,7 @@ int intel_selftest_modify_policy(struct intel_engine_cs 
*engine,
        if (!intel_engine_uses_guc(engine))
                return 0;
 
-       err = intel_guc_global_policies_update(&engine->gt->uc.guc);
+       err = intel_guc_global_policies_update(gt_to_guc(engine->gt));
        if (err)
                intel_selftest_restore_policy(engine, saved);
 
@@ -84,7 +84,7 @@ int intel_selftest_restore_policy(struct intel_engine_cs 
*engine,
        if (!intel_engine_uses_guc(engine))
                return 0;
 
-       return intel_guc_global_policies_update(&engine->gt->uc.guc);
+       return intel_guc_global_policies_update(gt_to_guc(engine->gt));
 }
 
 int intel_selftest_wait_for_rq(struct i915_request *rq)
-- 
2.42.0