From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com ([134.134.136.65]:11649 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752051AbdHHNjm (ORCPT ); Tue, 8 Aug 2017 09:39:42 -0400 From: Mika Kuoppala To: Chris Wilson , intel-gfx@lists.freedesktop.org Cc: Chris Wilson , stable@vger.kernel.org Subject: Re: [PATCH] drm/i915: Perform an invalidate prior to executing golden renderstate In-Reply-To: <87k22e5ggo.fsf@gaia.fi.intel.com> References: <20170808131904.1385-1-chris@chris-wilson.co.uk> <87k22e5ggo.fsf@gaia.fi.intel.com> Date: Tue, 08 Aug 2017 16:37:58 +0300 Message-ID: <87efsm5geh.fsf@gaia.fi.intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: stable-owner@vger.kernel.org List-ID: Mika Kuoppala writes: > Chris Wilson writes: > >> As we may have just bound the renderstate into the GGTT for execution, we >> need to ensure that the GTT TLB are also flushed. >> >> On snb-gt2, this would cause a random GPU hang at the start of a new >> context (e.g. boot) and on snb-gt1, it was causing the renderstate batch >> to take ~10s. It was the GPU hang that revealed the truth, as the CS >> gleefully executed beyond the end of the golden renderstate batch, a good >> indicator for a GTT TLB miss. >> >> Signed-off-by: Chris Wilson >> Cc: Mika Kuoppala >> Cc: stable@vger.kernel.org > > The flush has been there but got stomped by: > > Fixes: dc4be6071a24 ("drm/i915: Add explicit request management to i915_gem_init_hw()") > > Now we can fix the gen6 renderstate too ;) > > Reviewed-by: Mika Kuoppala On hindsight, should we actually do the flush through add request? -Mika > >> --- >> drivers/gpu/drm/i915/i915_gem_render_state.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.c b/drivers/gpu/drm/i915/i915_gem_render_state.c >> index 241d827b85fb..3703dc91eeda 100644 >> --- a/drivers/gpu/drm/i915/i915_gem_render_state.c >> +++ b/drivers/gpu/drm/i915/i915_gem_render_state.c >> @@ -242,6 +242,10 @@ int i915_gem_render_state_emit(struct drm_i915_gem_request *req) >> goto err_unpin; >> } >> >> + ret = req->engine->emit_flush(req, EMIT_INVALIDATE); >> + if (ret) >> + goto err_unpin; >> + >> ret = req->engine->emit_bb_start(req, >> so->batch_offset, so->batch_size, >> I915_DISPATCH_SECURE); >> -- >> 2.13.3