drm/i915: Convert gem_record_fences to uncore mmio accessors

More implicit dev_priv removal.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190610120608.15477-4-tvrtko.ursulin@linux.intel.com

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 193a93857d990ef89b485598fb339f9600005dbb..a523bf050a25f713f09ad71bb2f06a450ba14600 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -1123,17 +1123,23 @@ static u32 i915_error_generate_code(struct i915_gpu_state *error,
 static void gem_record_fences(struct i915_gpu_state *error)
 {
        struct drm_i915_private *dev_priv = error->i915;
+       struct intel_uncore *uncore = &dev_priv->uncore;
        int i;
 
        if (INTEL_GEN(dev_priv) >= 6) {
                for (i = 0; i < dev_priv->num_fence_regs; i++)
-                       error->fence[i] = I915_READ64(FENCE_REG_GEN6_LO(i));
+                       error->fence[i] =
+                               intel_uncore_read64(uncore,
+                                                   FENCE_REG_GEN6_LO(i));
        } else if (INTEL_GEN(dev_priv) >= 4) {
                for (i = 0; i < dev_priv->num_fence_regs; i++)
-                       error->fence[i] = I915_READ64(FENCE_REG_965_LO(i));
+                       error->fence[i] =
+                               intel_uncore_read64(uncore,
+                                                   FENCE_REG_965_LO(i));
        } else {
                for (i = 0; i < dev_priv->num_fence_regs; i++)
-                       error->fence[i] = I915_READ(FENCE_REG(i));
+                       error->fence[i] =
+                               intel_uncore_read(uncore, FENCE_REG(i));
        }
        error->nfence = i;
 }