Merge pull request #4583 from mglae/le10_haswell_2

linux: Haswell black screen fix for Generic
This commit is contained in:
CvH 2020-10-15 18:13:18 +02:00 committed by GitHub
commit f08bc5f663
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -0,0 +1,21 @@
Starting with kernel 5.7 there are GPU hangs on Intel Haswell CPUs.
See https://gitlab.freedesktop.org/drm/intel/-/issues/2024
Patch set https://patchwork.freedesktop.org/series/74363/ was identified to cause the issue
and is disabled by this patch. The patch and the failing code only affects Haswell CPUs.
diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
index 68a08486fc87..51545897f1ec 100644
--- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
@@ -2083,7 +2083,7 @@ int intel_ring_submission_setup(struct intel_engine_cs *engine)
GEM_BUG_ON(timeline->hwsp_ggtt != engine->status_page.vma);
- if (IS_HASWELL(engine->i915) && engine->class == RENDER_CLASS) {
+ if (IS_HASWELL(engine->i915) && engine->class == RENDER_CLASS && 0) {
err = gen7_ctx_switch_bb_init(engine);
if (err)
goto err_ring_unpin;