| Message ID | 1436290904-5765-1-git-send-email-arun.siluvery@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Arun Siluvery <arun.siluvery@linux.intel.com> writes: > In Indirect and Per context w/a batch buffer, > +WaDisableCtxRestoreArbitration > > v2: SKL revision id was used for BXT, copy paste error found during > internal review (Bob Beckett). > > Cc: Robert Beckett <robert.beckett@intel.com> > Cc: Imre Deak <imre.deak@intel.com> > Signed-off-by: Arun Siluvery <arun.siluvery@linux.intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> > --- > drivers/gpu/drm/i915/intel_lrc.c | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c > index 1e88b3b..e84fc52 100644 > --- a/drivers/gpu/drm/i915/intel_lrc.c > +++ b/drivers/gpu/drm/i915/intel_lrc.c > @@ -1274,10 +1274,13 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *ring, > uint32_t *const batch, > uint32_t *offset) > { > + struct drm_device *dev = ring->dev; > uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS); > > - /* FIXME: Replace me with WA */ > - wa_ctx_emit(batch, MI_NOOP); > + /* WaDisableCtxRestoreArbitration:skl,bxt */ > + if ((IS_SKYLAKE(dev) && (INTEL_REVID(dev) <= SKL_REVID_D0)) || > + (IS_BROXTON(dev) && (INTEL_REVID(dev) == BXT_REVID_A0))) > + wa_ctx_emit(batch, MI_ARB_ON_OFF | MI_ARB_DISABLE); > > /* Pad to end of cacheline */ > while (index % CACHELINE_DWORDS) > @@ -1291,8 +1294,14 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *ring, > uint32_t *const batch, > uint32_t *offset) > { > + struct drm_device *dev = ring->dev; > uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS); > > + /* WaDisableCtxRestoreArbitration:skl,bxt */ > + if ((IS_SKYLAKE(dev) && (INTEL_REVID(dev) <= SKL_REVID_D0)) || > + (IS_BROXTON(dev) && (INTEL_REVID(dev) == BXT_REVID_A0))) > + wa_ctx_emit(batch, MI_ARB_ON_OFF | MI_ARB_ENABLE); > + > wa_ctx_emit(batch, MI_BATCH_BUFFER_END); > > return wa_ctx_end(wa_ctx, *offset = index, 1); > -- > 1.9.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Mon, Jul 13, 2015 at 03:31:45PM +0300, Mika Kuoppala wrote: > Arun Siluvery <arun.siluvery@linux.intel.com> writes: > > > In Indirect and Per context w/a batch buffer, > > +WaDisableCtxRestoreArbitration > > > > v2: SKL revision id was used for BXT, copy paste error found during > > internal review (Bob Beckett). > > > > Cc: Robert Beckett <robert.beckett@intel.com> > > Cc: Imre Deak <imre.deak@intel.com> > > Signed-off-by: Arun Siluvery <arun.siluvery@linux.intel.com> > > Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> Merged first two patches of this series to dinq, thanks. -Daniel > > > --- > > drivers/gpu/drm/i915/intel_lrc.c | 13 +++++++++++-- > > 1 file changed, 11 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c > > index 1e88b3b..e84fc52 100644 > > --- a/drivers/gpu/drm/i915/intel_lrc.c > > +++ b/drivers/gpu/drm/i915/intel_lrc.c > > @@ -1274,10 +1274,13 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *ring, > > uint32_t *const batch, > > uint32_t *offset) > > { > > + struct drm_device *dev = ring->dev; > > uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS); > > > > - /* FIXME: Replace me with WA */ > > - wa_ctx_emit(batch, MI_NOOP); > > + /* WaDisableCtxRestoreArbitration:skl,bxt */ > > + if ((IS_SKYLAKE(dev) && (INTEL_REVID(dev) <= SKL_REVID_D0)) || > > + (IS_BROXTON(dev) && (INTEL_REVID(dev) == BXT_REVID_A0))) > > + wa_ctx_emit(batch, MI_ARB_ON_OFF | MI_ARB_DISABLE); > > > > /* Pad to end of cacheline */ > > while (index % CACHELINE_DWORDS) > > @@ -1291,8 +1294,14 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *ring, > > uint32_t *const batch, > > uint32_t *offset) > > { > > + struct drm_device *dev = ring->dev; > > uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS); > > > > + /* WaDisableCtxRestoreArbitration:skl,bxt */ > > + if ((IS_SKYLAKE(dev) && (INTEL_REVID(dev) <= SKL_REVID_D0)) || > > + (IS_BROXTON(dev) && (INTEL_REVID(dev) == BXT_REVID_A0))) > > + wa_ctx_emit(batch, MI_ARB_ON_OFF | MI_ARB_ENABLE); > > + > > wa_ctx_emit(batch, MI_BATCH_BUFFER_END); > > > > return wa_ctx_end(wa_ctx, *offset = index, 1); > > -- > > 1.9.1 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Mon, Jul 13, 2015 at 04:49:37PM +0200, Daniel Vetter wrote: > On Mon, Jul 13, 2015 at 03:31:45PM +0300, Mika Kuoppala wrote: > > Arun Siluvery <arun.siluvery@linux.intel.com> writes: > > > > > In Indirect and Per context w/a batch buffer, > > > +WaDisableCtxRestoreArbitration > > > > > > v2: SKL revision id was used for BXT, copy paste error found during > > > internal review (Bob Beckett). > > > > > > Cc: Robert Beckett <robert.beckett@intel.com> > > > Cc: Imre Deak <imre.deak@intel.com> > > > Signed-off-by: Arun Siluvery <arun.siluvery@linux.intel.com> > > > > Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> > > Merged first two patches of this series to dinq, thanks. Actually strike that, these all need rebasing. Dropped again. -Daniel
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 1e88b3b..e84fc52 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1274,10 +1274,13 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *ring, uint32_t *const batch, uint32_t *offset) { + struct drm_device *dev = ring->dev; uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS); - /* FIXME: Replace me with WA */ - wa_ctx_emit(batch, MI_NOOP); + /* WaDisableCtxRestoreArbitration:skl,bxt */ + if ((IS_SKYLAKE(dev) && (INTEL_REVID(dev) <= SKL_REVID_D0)) || + (IS_BROXTON(dev) && (INTEL_REVID(dev) == BXT_REVID_A0))) + wa_ctx_emit(batch, MI_ARB_ON_OFF | MI_ARB_DISABLE); /* Pad to end of cacheline */ while (index % CACHELINE_DWORDS) @@ -1291,8 +1294,14 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *ring, uint32_t *const batch, uint32_t *offset) { + struct drm_device *dev = ring->dev; uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS); + /* WaDisableCtxRestoreArbitration:skl,bxt */ + if ((IS_SKYLAKE(dev) && (INTEL_REVID(dev) <= SKL_REVID_D0)) || + (IS_BROXTON(dev) && (INTEL_REVID(dev) == BXT_REVID_A0))) + wa_ctx_emit(batch, MI_ARB_ON_OFF | MI_ARB_ENABLE); + wa_ctx_emit(batch, MI_BATCH_BUFFER_END); return wa_ctx_end(wa_ctx, *offset = index, 1);
In Indirect and Per context w/a batch buffer, +WaDisableCtxRestoreArbitration v2: SKL revision id was used for BXT, copy paste error found during internal review (Bob Beckett). Cc: Robert Beckett <robert.beckett@intel.com> Cc: Imre Deak <imre.deak@intel.com> Signed-off-by: Arun Siluvery <arun.siluvery@linux.intel.com> --- drivers/gpu/drm/i915/intel_lrc.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)