drm/i915: Re-enable per-engine reset for Broxton
authorMichel Thierry <michel.thierry@intel.com>
Fri, 18 Aug 2017 17:23:42 +0000 (10:23 -0700)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 22 Aug 2017 11:27:18 +0000 (12:27 +0100)
The corruption in CSB mmio reads we were seeing has been tracked down to
incorrectly touching forcewake of all domains, following an engine reset.
It is still a mistery why we only catched this in Broxton, since it
could happen in any platform.

With that fix already merged, commit 4055dc75d6b5 ("drm/i915: Stop
touching forcewake following a gen6+ engine reset"), lets try to enable
per-engine resets in Broxton one more time.

This reverts commit f188258bde0f ("drm/i915: Disable per-engine reset for
Broxton").

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170818172342.7282-1-michel.thierry@intel.com
Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/i915_pci.c

index 09d97e0..a1e6b69 100644 (file)
@@ -398,7 +398,6 @@ static const struct intel_device_info intel_broxton_info = {
        GEN9_LP_FEATURES,
        .platform = INTEL_BROXTON,
        .ddb_size = 512,
-       .has_reset_engine = false,
 };
 
 static const struct intel_device_info intel_geminilake_info = {