diff options
| author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2019-06-10 13:06:06 +0100 |
|---|---|---|
| committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2019-06-10 16:55:26 +0100 |
| commit | 7f1502d9961477c40ea4c93c9f59f342867ebe2e (patch) | |
| tree | 8bb31f3719702616fdd7da7db0f39d9b71f48a0b /drivers/gpu/drm/i915/i915_gpu_error.c | |
| parent | 8500f14b6398d35779acc6ad8b76dbbec2487a8b (diff) | |
| download | talos-op-linux-7f1502d9961477c40ea4c93c9f59f342867ebe2e.tar.gz talos-op-linux-7f1502d9961477c40ea4c93c9f59f342867ebe2e.zip | |
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
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gpu_error.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gpu_error.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 193a93857d99..a523bf050a25 100644 --- 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; } |
