drm/i915: don't try to load GuC fw on pre-gen9

This avoids some bad register writes and generally feels more correct
than unconditionally trying to redirect interrupts and such.

References: https://bugs.freedesktop.org/show_bug.cgi?id=91777
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Jesse Barnes 2015-09-10 14:55:00 -07:00 коммит произвёл Daniel Vetter
Родитель 6ff8ab0d0f
Коммит 87bcdd2e27
1 изменённых файлов: 16 добавлений и 13 удалений

Просмотреть файл

@ -4687,6 +4687,7 @@ i915_gem_init_hw(struct drm_device *dev)
}
/* We can't enable contexts until all firmware is loaded */
if (HAS_GUC_UCODE(dev)) {
ret = intel_guc_ucode_load(dev);
if (ret) {
/*
@ -4696,11 +4697,13 @@ i915_gem_init_hw(struct drm_device *dev)
* discard the error and carry on.
*/
DRM_ERROR("Failed to initialize GuC, error %d%s\n", ret,
i915.enable_guc_submission ? "" : " (ignored)");
i915.enable_guc_submission ? "" :
" (ignored)");
ret = i915.enable_guc_submission ? -EIO : 0;
if (ret)
goto out;
}
}
/* Now it is safe to go back round and do everything else: */
for_each_ring(ring, dev_priv, i) {