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
This commit is contained in:
Daniele Ceraolo Spurio 2019-07-23 10:14:03 +01:00 committed by Chris Wilson
parent aed7450b15
commit 3fcba88188

View File

@ -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);