[Intel-gfx] [PATCH 5/5] drm/i915: Mark per-engine-reset as supported on gen7

Chris Wilson chris at chris-wilson.co.uk
Tue Jan 19 11:06:10 UTC 2021


Quoting Mika Kuoppala (2021-01-19 11:00:19)
> Chris Wilson <chris at chris-wilson.co.uk> writes:
> 
> > The benefit of only resetting a single engine is that we leave other
> > streams of userspace work intact across a hang; vital for process
> > isolation. We had wired up individual engine resets for gen6, but only
> > enabled it from gen8; now let's turn it on for the forgotten gen7. gen6
> > is still a mystery as how to unravel some global state that appears to
> > be reset along with an engine (in particular the ppgtt enabling in
> > GFX_MODE).
> >
> > Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> > ---
> >  drivers/gpu/drm/i915/i915_pci.c | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> > index 39608381b4a4..020b5f561f07 100644
> > --- a/drivers/gpu/drm/i915/i915_pci.c
> > +++ b/drivers/gpu/drm/i915/i915_pci.c
> > @@ -455,6 +455,7 @@ static const struct intel_device_info snb_m_gt2_info = {
> >       .has_llc = 1, \
> >       .has_rc6 = 1, \
> >       .has_rc6p = 1, \
> > +     .has_reset_engine = true, \
> >       .has_rps = true, \
> >       .dma_mask_size = 40, \
> >       .ppgtt_type = INTEL_PPGTT_ALIASING, \
> > @@ -513,6 +514,7 @@ static const struct intel_device_info vlv_info = {
> >       .cpu_transcoder_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B),
> >       .has_runtime_pm = 1,
> >       .has_rc6 = 1,
> > +     .has_reset_engine = true,
> >       .has_rps = true,
> >       .display.has_gmch = 1,
> >       .display.has_hotplug = 1,
> > @@ -571,8 +573,7 @@ static const struct intel_device_info hsw_gt3_info = {
> >       .dma_mask_size = 39, \
> >       .ppgtt_type = INTEL_PPGTT_FULL, \
> >       .ppgtt_size = 48, \
> > -     .has_64bit_reloc = 1, \
> > -     .has_reset_engine = 1
> 
> Oh we already did on hsw.

Don't be fooled by diff, it gets very confused by i915_pci.c

This is actually GEN8_FEATURES.
 
> Acked-by: Mika Kuoppala <mika.kuoppala at linux.intel.com>

Thanks,
-Chris


More information about the Intel-gfx mailing list