From: Tim Gore Date: Wed, 20 Jul 2016 10:00:25 +0000 (+0100) Subject: drm/i915:gen9: restrict WaC6DisallowByGfxPause X-Git-Tag: Ubuntu-5.10.0-12.13~11685^2~40^2~156 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=65fe29eeec71d3e50870c5048d2c79bc9a477a76;p=mirror_ubuntu-hirsute-kernel.git drm/i915:gen9: restrict WaC6DisallowByGfxPause WaC6DisallowByGfxPause is currently applied unconditionally but is not required in all revisions. v2: extend application of workaround to agree with w/a database, which differs from the HSD. References: HSD#2133391 Signed-off-by: Tim Gore Reviewed-by: Sagar Arun Kamble Signed-off-by: Tvrtko Ursulin Link: http://patchwork.freedesktop.org/patch/msgid/1469008825-19442-1-git-send-email-tim.gore@intel.com --- diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c index a6a8fba7acd0..b883efd35e3f 100644 --- a/drivers/gpu/drm/i915/intel_guc_loader.c +++ b/drivers/gpu/drm/i915/intel_guc_loader.c @@ -349,7 +349,9 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv) } /* WaC6DisallowByGfxPause*/ - I915_WRITE(GEN6_GFXPAUSE, 0x30FFF); + if (IS_SKL_REVID(dev, 0, SKL_REVID_C0) || + IS_BXT_REVID(dev, 0, BXT_REVID_B0)) + I915_WRITE(GEN6_GFXPAUSE, 0x30FFF); if (IS_BROXTON(dev)) I915_WRITE(GEN9LP_GT_PM_CONFIG, GT_DOORBELL_ENABLE);