From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Arun Siluvery <arun.siluvery@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 1/2] drm/i915/chv: Add few more CHV workarounds
Date: Tue, 28 Oct 2014 14:23:48 +0200 [thread overview]
Message-ID: <20141028122348.GV4284@intel.com> (raw)
In-Reply-To: <1414497471-14958-1-git-send-email-arun.siluvery@linux.intel.com>
On Tue, Oct 28, 2014 at 11:57:50AM +0000, Arun Siluvery wrote:
> WaDisableInstructionShootdown:chv
> WaForceEnableNonCoherent:chv
> WaHdcDisableFetchWhenMasked:chv
> WaDisableFenceDestinationToSLM:chv (pre-production)
>
> s/WaDisableDopClockGating/WaDisableRowChickenDopClockGating, because another
> CHV WA is defined with the same name in intel_pm.c for a different reg.
>
> For: VIZ-4090
> Signed-off-by: Arun Siluvery <arun.siluvery@linux.intel.com>
> ---
> drivers/gpu/drm/i915/i915_reg.h | 2 ++
> drivers/gpu/drm/i915/intel_ringbuffer.c | 20 ++++++++++++++++++--
> 2 files changed, 20 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 77fce96..840e5d9 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -5024,6 +5024,7 @@ enum punit_power_well {
> /* GEN8 chicken */
> #define HDC_CHICKEN0 0x7300
> #define HDC_FORCE_NON_COHERENT (1<<4)
> +#define HDC_DONOT_FETCH_MEM_WHEN_MASKED (1<<11)
> #define HDC_FENCE_DEST_SLM_DISABLE (1<<14)
>
> /* WaCatErrorRejectionIssue */
> @@ -5941,6 +5942,7 @@ enum punit_power_well {
> #define GEN9_DG_MIRROR_FIX_ENABLE (1<<5)
>
> #define GEN8_ROW_CHICKEN 0xe4f0
> +#define INSTRUCTION_SHOOTDOWN_DISABLE (1<<9)
> #define PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE (1<<8)
> #define STALL_DOP_GATING_DISABLE (1<<5)
>
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index a8f72e8..2c07a02 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -788,14 +788,30 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)
> struct drm_i915_private *dev_priv = dev->dev_private;
>
> /* WaDisablePartialInstShootdown:chv */
> + /* WaDisableInstructionShootdown:chv */
> WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,
> - PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
> + PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE |
> + (dev->pdev->revision < 0x06 ?
> + INSTRUCTION_SHOOTDOWN_DISABLE : 0));
I think we should just drop the current early pre-prod workarounds, and
not add more of them.
>
> /* WaDisableThreadStallDopClockGating:chv */
> WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,
> STALL_DOP_GATING_DISABLE);
>
> - /* WaDisableDopClockGating:chv (pre-production hw) */
> + /* Use Force Non-Coherent whenever executing a 3D context. This is a
> + * workaround for a possible hang in the unlikely event a TLB
> + * invalidation occurs during a PSD flush.
> + */
We haven't generally documented the w/as in any great detail. Does it
help someone if we start doing that?
> + /* WaForceEnableNonCoherent:chv */
> + /* WaHdcDisableFetchWhenMasked:chv */
> + /* WaDisableFenceDestinationToSLM:chv (pre-production) */
> + WA_SET_BIT_MASKED(HDC_CHICKEN0,
> + HDC_FORCE_NON_COHERENT |
> + HDC_DONOT_FETCH_MEM_WHEN_MASKED |
> + (dev->pdev->revision < 0x06 ?
> + HDC_FENCE_DEST_SLM_DISABLE : 0));
> +
> + /* WaDisableRowChickenDopClockGating:chv (pre-production hw) */
> WA_SET_BIT_MASKED(GEN7_ROW_CHICKEN2,
> DOP_CLOCK_GATING_DISABLE);
>
> --
> 2.1.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2014-10-28 12:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-28 11:57 [PATCH 1/2] drm/i915/chv: Add few more CHV workarounds Arun Siluvery
2014-10-28 11:57 ` [PATCH 2/2] drm/i915/gen8: Apply pre-production WA based on revision Arun Siluvery
2014-10-28 12:23 ` Ville Syrjälä [this message]
2014-10-28 13:32 ` [PATCH 1/2] drm/i915/chv: Add few more CHV workarounds Siluvery, Arun
2014-10-28 14:39 ` Ville Syrjälä
2014-10-28 15:02 ` Jani Nikula
2014-10-28 15:48 ` [PATCH] drm/i915/chv: Add new WA and remove pre-production ones Arun Siluvery
2014-10-28 17:06 ` Ville Syrjälä
2014-10-28 17:54 ` Siluvery, Arun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141028122348.GV4284@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=arun.siluvery@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox