diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-07-01 02:08:15 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-07-01 02:08:15 +0000 |
| commit | a9990954ff6b152090b108d72d4a4f9d7751f31a (patch) | |
| tree | 85dbe2357c81c5648831b5aea84452506d463682 /sys | |
| parent | cb5a90a96e4d1af7ac33ac9857a8456a9ed8ba2c (diff) | |
disable logical ring contexts on cherryview/braswell
avoids gpu hangs seen when starting Xorg seen with 4.19 and 5.7 drm
'intel_engine_reset *NOTICE* Resetting rcs0 for stopped heartbeat on rcs0'
reported by multiple people on bugs@
workaround tested by Martin Ziemer and myself
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_pci.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sys/dev/pci/drm/i915/i915_pci.c b/sys/dev/pci/drm/i915/i915_pci.c index 38a66df95eb..97b3504abb1 100644 --- a/sys/dev/pci/drm/i915/i915_pci.c +++ b/sys/dev/pci/drm/i915/i915_pci.c @@ -588,7 +588,15 @@ static const struct intel_device_info chv_info = { .has_runtime_pm = 1, .has_rc6 = 1, .has_rps = true, +#ifdef __linux__ .has_logical_ring_contexts = 1, +#else + /* + * avoid 'Resetting rcs0 for stopped heartbeat on rcs0' GPU hang + * when starting X + */ + .has_logical_ring_contexts = 0, +#endif .display.has_gmch = 1, .ppgtt_type = INTEL_PPGTT_ALIASING, .ppgtt_size = 32, |