From mboxrd@z Thu Jan 1 00:00:00 1970 From: Damien Lespiau Subject: Re: [PATCH] drm/i915: Emit even number of dwords when emitting LRIs Date: Wed, 22 Oct 2014 22:59:51 +0100 Message-ID: <20141022215951.GD5876@strange.amr.corp.intel.com> References: <1414000792-16111-1-git-send-email-arun.siluvery@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 54C9D6E393 for ; Wed, 22 Oct 2014 15:00:16 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1414000792-16111-1-git-send-email-arun.siluvery@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Arun Siluvery Cc: intel-gfx@lists.freedesktop.org, Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org On Wed, Oct 22, 2014 at 06:59:52PM +0100, Arun Siluvery wrote: > The number of DWords should be even when doing ring emits as > command sequences require QWord alignment. > > v2: user LRI variant that can write multiple regs in one go (Damien). > We can simply insert one NOP at the end instead of one per register write. > > Cc: Mika Kuoppala > Signed-off-by: Arun Siluvery Looks good to me (maybe without the extra '()' outlined below). Reviewed-by: Damien Lespiau -- Damien > --- > drivers/gpu/drm/i915/intel_ringbuffer.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c > index 497b836..a8f72e8 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c > @@ -680,15 +680,16 @@ static int intel_ring_workarounds_emit(struct intel_engine_cs *ring) > if (ret) > return ret; > > - ret = intel_ring_begin(ring, w->count * 3); > + ret = intel_ring_begin(ring, (w->count * 2 + 2)); No need of the () around the second argument. > if (ret) > return ret; > > + intel_ring_emit(ring, MI_LOAD_REGISTER_IMM(w->count)); > for (i = 0; i < w->count; i++) { > - intel_ring_emit(ring, MI_LOAD_REGISTER_IMM(1)); > intel_ring_emit(ring, w->reg[i].addr); > intel_ring_emit(ring, w->reg[i].value); > } > + intel_ring_emit(ring, MI_NOOP); > > intel_ring_advance(ring); > > -- > 2.1.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx