diff options
| author | Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> | 2019-07-23 12:14:03 +0300 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-07-23 13:38:16 +0300 |
| commit | 3fcba88188a85a398c2c9245d148c952e2d53889 (patch) | |
| tree | 6d4492e78488cf436f45d6bfd1624ce268c62b30 | |
| parent | aed7450b153666074d1e1d6c38f6a1ff14c7f80c (diff) | |
| download | linux-3fcba88188a85a398c2c9245d148c952e2d53889.tar.xz | |
drm/i915/uc: Gt-fy uc reset
This was the last place in gt/uc that was still using I915_READ
with the global dev_priv.
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@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/20190723091404.6449-1-chris@chris-wilson.co.uk
| -rw-r--r-- | drivers/gpu/drm/i915/gt/uc/intel_uc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c index 5ebb0a534718..4480a3dc2449 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c @@ -37,17 +37,17 @@ static void guc_free_load_err_log(struct intel_guc *guc); */ static int __intel_uc_reset_hw(struct intel_uc *uc) { - struct drm_i915_private *dev_priv = uc_to_gt(uc)->i915; + struct intel_gt *gt = uc_to_gt(uc); int ret; u32 guc_status; - ret = intel_reset_guc(&dev_priv->gt); + ret = intel_reset_guc(gt); if (ret) { DRM_ERROR("Failed to reset GuC, ret = %d\n", ret); return ret; } - guc_status = I915_READ(GUC_STATUS); + guc_status = intel_uncore_read(gt->uncore, GUC_STATUS); WARN(!(guc_status & GS_MIA_IN_RESET), "GuC status: 0x%x, MIA core expected to be in reset\n", guc_status); |