The CI farm reports that trying to write to the PCI config (GDRST: 0xc0) results in an immediate and silent reboot on Grantsdale (i915g). Until that is resolved, stop killing the machine! Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101852 Fixes: 59ea90543f57 ("drm/i915: Implement GPU reset for 915/945") Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxx --- drivers/gpu/drm/i915/intel_uncore.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index deb4430541cf..452ea6cc8111 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -1680,7 +1680,8 @@ static reset_func intel_get_gpu_reset(struct drm_i915_private *dev_priv) return g4x_do_reset; else if (IS_G33(dev_priv) || IS_PINEVIEW(dev_priv)) return g33_do_reset; - else if (INTEL_INFO(dev_priv)->gen >= 3) + else if (INTEL_INFO(dev_priv)->gen >= 3 && + INTEL_INFO(dev_priv)->platform != INTEL_I915G) return i915_do_reset; else return NULL; -- 2.13.3 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
