drm/i915/guc: Update uncore access path in flush_ggtt_writes

The preferred way to access the uncore is through the GT structure.
Update the GuC function, flush_ggtt_writes, to use this path.

Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: John Harrison <john.c.harrison@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20191207010033.24667-1-John.C.Harrison@Intel.com

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
index 6f94af7ad1de24eb5a5ead7f703c42e7f3c8e67c..4df296a5e7c7a860187591e8b7de4124c55edca7 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -488,10 +488,9 @@ static void guc_add_request(struct intel_guc *guc, struct i915_request *rq)
  */
 static void flush_ggtt_writes(struct i915_vma *vma)
 {
-       struct drm_i915_private *i915 = vma->vm->i915;
-
        if (i915_vma_is_map_and_fenceable(vma))
-               intel_uncore_posting_read_fw(&i915->uncore, GUC_STATUS);
+               intel_uncore_posting_read_fw(vma->vm->gt->uncore,
+                                            GUC_STATUS);
 }
 
 static void guc_submit(struct intel_engine_cs *engine,