Merge tag 'drm-intel-gt-next-2024-04-26' of https://anongit.freedesktop.org/git/drm...

[linux-block.git] / drivers / gpu / drm / i915 / gt / intel_ggtt.c

diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
index ec1cbe229f0e42c7be96f83da2cee40cc41bc93f..0d0a0dc9f6108f50149d5968de9c251eb3bfb86a 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
@@ -231,11 +231,8 @@ static void guc_ggtt_ct_invalidate(struct intel_gt *gt)
        struct intel_uncore *uncore = gt->uncore;
        intel_wakeref_t wakeref;
 
-       with_intel_runtime_pm_if_active(uncore->rpm, wakeref) {
-               struct intel_guc *guc = &gt->uc.guc;
-
-               intel_guc_invalidate_tlb_guc(guc);
-       }
+       with_intel_runtime_pm_if_active(uncore->rpm, wakeref)
+               intel_guc_invalidate_tlb_guc(gt_to_guc(gt));
 }
 
 static void guc_ggtt_invalidate(struct i915_ggtt *ggtt)
@@ -246,7 +243,7 @@ static void guc_ggtt_invalidate(struct i915_ggtt *ggtt)
        gen8_ggtt_invalidate(ggtt);
 
        list_for_each_entry(gt, &ggtt->gt_list, ggtt_link) {
-               if (intel_guc_tlb_invalidation_is_available(&gt->uc.guc))
+               if (intel_guc_tlb_invalidation_is_available(gt_to_guc(gt)))
                        guc_ggtt_ct_invalidate(gt);
                else if (GRAPHICS_VER(i915) >= 12)
                        intel_uncore_write_fw(gt->uncore,