Let's trust both the user (i915.reset modparam) and device caps instead of attempting to reset unconditionally.
Signed-off-by: Michał Winiarski <[email protected]> Cc: Arkadiusz Hiler <[email protected]> Cc: Michal Wajdeczko <[email protected]> Cc: Stuart Summers <[email protected]> Cc: Tvrtko Ursulin <[email protected]> --- drivers/gpu/drm/i915/intel_uc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c index a8e7f0ba7c3b..0752fb77b6fe 100644 --- a/drivers/gpu/drm/i915/intel_uc.c +++ b/drivers/gpu/drm/i915/intel_uc.c @@ -38,6 +38,11 @@ static int __intel_uc_reset_hw(struct drm_i915_private *dev_priv) int ret; u32 guc_status; + if (!intel_has_gpu_reset(dev_priv)) { + DRM_DEBUG_DRIVER("GPU reset disabled, skipping GuC reset\n"); + return 0; + } + ret = intel_reset_guc(dev_priv); if (ret) { DRM_ERROR("Failed to reset GuC, ret = %d\n", ret); -- 2.21.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
