From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: Re: [PATCH] tests/gem_cs_prefetch: Fix bdw damage Date: Thu, 14 Nov 2013 09:30:44 -0800 Message-ID: <20131114173044.GA28106@bwidawsk.net> References: <1384440662-7494-1-git-send-email-daniel.vetter@ffwll.ch> <1384441898-17879-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail.bwidawsk.net (bwidawsk.net [166.78.191.112]) by gabe.freedesktop.org (Postfix) with ESMTP id ED3E8FB54D for ; Thu, 14 Nov 2013 09:30:48 -0800 (PST) Content-Disposition: inline In-Reply-To: <1384441898-17879-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Daniel Vetter Cc: Intel Graphics Development List-Id: intel-gfx@lists.freedesktop.org On Thu, Nov 14, 2013 at 04:11:38PM +0100, Daniel Vetter wrote: > v2: Fix more. > > Cc: Ben Widawsky > Signed-off-by: Daniel Vetter > --- > lib/intel_batchbuffer.c | 4 +++- > tests/gem_cs_prefetch.c | 3 --- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c > index e284d4870cd6..06a543728579 100644 > --- a/lib/intel_batchbuffer.c > +++ b/lib/intel_batchbuffer.c > @@ -239,7 +239,9 @@ intel_blt_copy(struct intel_batchbuffer *batch, > CHECK_RANGE(src_pitch) && CHECK_RANGE(dst_pitch)); > #undef CHECK_RANGE > > - BLIT_COPY_BATCH_START(batch->devid, cmd_bits); > + BEGIN_BATCH(intel_gen(batch->devid) >= 8 ? 10 : 8); > + OUT_BATCH(XY_SRC_COPY_BLT_CMD | cmd_bits | > + (intel_gen(batch->devid) >= 8 ? 8 : 6)); > OUT_BATCH((br13_bits) | > (0xcc << 16) | /* copy ROP */ > dst_pitch); I'd vote to just move this into the BLIT_COPY_BATCH_START macro. We already have the devid. > diff --git a/tests/gem_cs_prefetch.c b/tests/gem_cs_prefetch.c > index 229a385a2fcd..eb515eadca2e 100644 > --- a/tests/gem_cs_prefetch.c > +++ b/tests/gem_cs_prefetch.c > @@ -133,9 +133,6 @@ int main(int argc, char **argv) > /* copy the sample batch with the gpu to the new one, so that we > * also test the unmappable part of the gtt. */ > BLIT_COPY_BATCH_START(batch->devid, 0); > - OUT_BATCH(XY_SRC_COPY_BLT_CMD | > - XY_SRC_COPY_BLT_WRITE_ALPHA | > - XY_SRC_COPY_BLT_WRITE_RGB); > OUT_BATCH((3 << 24) | /* 32 bits */ > (0xcc << 16) | /* copy ROP */ > 4096); This hunk was already fixed upstream. > -- > 1.8.1.4 > -- Ben Widawsky, Intel Open Source Technology Center