Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> writes: > In the previous patch (to include a rmb() after readig the CSB WRITE > pointer from the HWSP) we believe we have fixed the underlying bug, and > so can re-enable using the HWSP on Cannolake. > > This reverts commit 61bf9719fa17 ("drm/i915/cnl: Use mmio access to > context status buffer"). > > References: https://bugs.freedesktop.org/show_bug.cgi?id=105888 > References: https://bugs.freedesktop.org/show_bug.cgi?id=106185 > References: 61bf9719fa17 ("drm/i915/cnl: Use mmio access to context status buffer") > Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > Cc: Mika Kuoppala <mika.kuoppala@xxxxxxxxxxxxxxx> > Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> > Cc: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx> > Cc: Michał Winiarski <michal.winiarski@xxxxxxxxx> > Cc: Rafael Antognolli <rafael.antognolli@xxxxxxxxx> > Cc: Michel Thierry <michel.thierry@xxxxxxxxx> > Cc: Timo Aaltonen <tjaalton@xxxxxxxxxx> > Tested-by: Timo Aaltonen <tjaalton@xxxxxxxxxx> Acked-by: Mika Kuoppala <mika.kuoppala@xxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_engine_cs.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c > index 70325e0824e3..8303e05b0c7d 100644 > --- a/drivers/gpu/drm/i915/intel_engine_cs.c > +++ b/drivers/gpu/drm/i915/intel_engine_cs.c > @@ -470,9 +470,6 @@ static bool csb_force_mmio(struct drm_i915_private *i915) > if (intel_vgpu_active(i915) && !intel_vgpu_has_hwsp_emulation(i915)) > return true; > > - if (IS_CANNONLAKE(i915)) > - return true; > - > return false; > } > > -- > 2.17.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx