[PATCH 1/2] drm/i915/skl: Fix rc6 based gpu/system hang

[PATCH 1/2] drm/i915/skl: Fix rc6 based gpu/system hang

[Mika Kuoppala]

For all gt3 and gt4 skylake variants, extend the usage of
WaRsDisableCoarsePowerGating for all revisions. Without this
gt3 and gt4 skylakes up to atleast rev 0xa can gpu hang or
system hang.

Cc: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
Cc: Ben Widawsky <benjamin.widawsky@intel.com>
Cc: Timo Aaltonen <tjaalton@ubuntu.com>
Cc: <stable@vger.kernel.org>
Reported-by: Mikael Djurfeldt <mikael@djurfeldt.com>
References: https://bugs.freedesktop.org/show_bug.cgi?id=94161
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 10480939159c..daba7ebb9699 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2634,8 +2634,9 @@ struct drm_i915_cmd_table {
 
 /* WaRsDisableCoarsePowerGating:skl,bxt */
 #define NEEDS_WaRsDisableCoarsePowerGating(dev) (IS_BXT_REVID(dev, 0, BXT_REVID_A1) || \
-						 ((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) && \
-						  IS_SKL_REVID(dev, 0, SKL_REVID_F0)))
+						 IS_SKL_GT3(dev) || \
+						 IS_SKL_GT4(dev))
+
 /*
  * dp aux and gmbus irq on gen4 seems to be able to generate legacy interrupts
  * even when in MSI mode. This results in spurious interrupt warnings if the
-- 
2.5.0

[PATCH 2/2] drm/i915/skl: Fix spurious gpu hang with gt3/gt4 revs

[Mika Kuoppala]

Experiments with heaven 4.0 benchmark and skylake gt3e (rev 0xa)
suggest that WaForceContextSaveRestoreNonCoherent is needed for all
revs. Extending this to all revs cures a gpu hang with rev 0xa when
running heaven4.0 gpu benchmark.

We have been here before, with problems enabling gt4e and extending
up to revision F0 instead of false claims of bspec of E0 only. See
commit <e238659ddd88> ("drm/i915/skl: Default to noncoherent access
up to F0"). In retrospect we should have covered this with this big
blanket back then already, as E0 vs F0 discrepancy was suspicious
enough.

Previously the WaForceEnableNonCoherent has been tied to
context non-coherence, atleast in relevant hsds. So keep this tie
and extended this alongside.

Cc: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
Cc: Ben Widawsky <benjamin.widawsky@intel.com>
Cc: Timo Aaltonen <tjaalton@ubuntu.com>
Cc: stable@vger.kernel.org
Reported-by: Mike Lothian <mike@fireburn.co.uk>
References: https://bugs.freedesktop.org/show_bug.cgi?id=93491
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
---
 drivers/gpu/drm/i915/intel_ringbuffer.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 45ce45a5e122..7fce1e6afcbc 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -968,7 +968,7 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)
 
 	/* WaForceContextSaveRestoreNonCoherent:skl,bxt */
 	tmp = HDC_FORCE_CONTEXT_SAVE_RESTORE_NON_COHERENT;
-	if (IS_SKL_REVID(dev, SKL_REVID_F0, SKL_REVID_F0) ||
+	if (IS_SKL_REVID(dev, SKL_REVID_F0, REVID_FOREVER) ||
 	    IS_BXT_REVID(dev, BXT_REVID_B0, REVID_FOREVER))
 		tmp |= HDC_FORCE_CSR_NON_COHERENT_OVR_DISABLE;
 	WA_SET_BIT_MASKED(HDC_CHICKEN0, tmp);
@@ -1085,7 +1085,8 @@ static int skl_init_workarounds(struct intel_engine_cs *ring)
 		WA_SET_BIT_MASKED(HIZ_CHICKEN,
 				  BDW_HIZ_POWER_COMPILER_CLOCK_GATING_DISABLE);
 
-	if (IS_SKL_REVID(dev, 0, SKL_REVID_F0)) {
+	/* This is tied to WaForceContextSaveRestoreNonCoherent */
+	if (IS_SKL_REVID(dev, 0, REVID_FOREVER)) {
 		/*
 		 *Use Force Non-Coherent whenever executing a 3D context. This
 		 * is a workaround for a possible hang in the unlikely event
-- 
2.5.0

Re: [PATCH 1/2] drm/i915/skl: Fix rc6 based gpu/system hang

[Timo Aaltonen]

05.04.2016, 15:56, Mika Kuoppala kirjoitti:
> For all gt3 and gt4 skylake variants, extend the usage of
> WaRsDisableCoarsePowerGating for all revisions. Without this
> gt3 and gt4 skylakes up to atleast rev 0xa can gpu hang or
> system hang.
> 
> Cc: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
> Cc: Ben Widawsky <benjamin.widawsky@intel.com>
> Cc: Timo Aaltonen <tjaalton@ubuntu.com>
> Cc: <stable@vger.kernel.org>
> Reported-by: Mikael Djurfeldt <mikael@djurfeldt.com>
> References: https://bugs.freedesktop.org/show_bug.cgi?id=94161
> Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
> ---

thanks, with a big-n-loud

Tested-by: Timo Aaltonen <tjaalton@ubuntu.com>

to both


-- 
t

Re: [PATCH 2/2] drm/i915/skl: Fix spurious gpu hang with gt3/gt4 revs

[Ben Widawsky]

On Tue, Apr 05, 2016 at 03:56:17PM +0300, Mika Kuoppala wrote:
> Experiments with heaven 4.0 benchmark and skylake gt3e (rev 0xa)
> suggest that WaForceContextSaveRestoreNonCoherent is needed for all
> revs. Extending this to all revs cures a gpu hang with rev 0xa when
> running heaven4.0 gpu benchmark.
> 
> We have been here before, with problems enabling gt4e and extending
> up to revision F0 instead of false claims of bspec of E0 only. See
> commit <e238659ddd88> ("drm/i915/skl: Default to noncoherent access
> up to F0"). In retrospect we should have covered this with this big
> blanket back then already, as E0 vs F0 discrepancy was suspicious
> enough.
> 
> Previously the WaForceEnableNonCoherent has been tied to
> context non-coherence, atleast in relevant hsds. So keep this tie
> and extended this alongside.
> 
> Cc: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
> Cc: Ben Widawsky <benjamin.widawsky@intel.com>
> Cc: Timo Aaltonen <tjaalton@ubuntu.com>
> Cc: stable@vger.kernel.org
> Reported-by: Mike Lothian <mike@fireburn.co.uk>
> References: https://bugs.freedesktop.org/show_bug.cgi?id=93491
> Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>

I don't have a reproducible hang, but both are:
Reviewed-by: Ben Widawsky <benjamin.widawsky@intel.com>

-- 
Ben Widawsky, Intel Open Source Technology Center

Re: [PATCH 2/2] drm/i915/skl: Fix spurious gpu hang with gt3/gt4 revs

[Mika Kuoppala]

Ben Widawsky <benjamin.widawsky@intel.com> writes:

> [ text/plain ]
> On Tue, Apr 05, 2016 at 03:56:17PM +0300, Mika Kuoppala wrote:
>> Experiments with heaven 4.0 benchmark and skylake gt3e (rev 0xa)
>> suggest that WaForceContextSaveRestoreNonCoherent is needed for all
>> revs. Extending this to all revs cures a gpu hang with rev 0xa when
>> running heaven4.0 gpu benchmark.
>> 
>> We have been here before, with problems enabling gt4e and extending
>> up to revision F0 instead of false claims of bspec of E0 only. See
>> commit <e238659ddd88> ("drm/i915/skl: Default to noncoherent access
>> up to F0"). In retrospect we should have covered this with this big
>> blanket back then already, as E0 vs F0 discrepancy was suspicious
>> enough.
>> 
>> Previously the WaForceEnableNonCoherent has been tied to
>> context non-coherence, atleast in relevant hsds. So keep this tie
>> and extended this alongside.
>> 
>> Cc: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
>> Cc: Ben Widawsky <benjamin.widawsky@intel.com>
>> Cc: Timo Aaltonen <tjaalton@ubuntu.com>
>> Cc: stable@vger.kernel.org
>> Reported-by: Mike Lothian <mike@fireburn.co.uk>
>> References: https://bugs.freedesktop.org/show_bug.cgi?id=93491
>> Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
>
> I don't have a reproducible hang, but both are:
> Reviewed-by: Ben Widawsky <benjamin.widawsky@intel.com>
>

Both patches pushed to dinq. Thanks for review and testing.

-MIka

> -- 
> Ben Widawsky, Intel Open Source Technology Center