From patchwork Tue Dec 10 07:29:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenneth Graunke X-Patchwork-Id: 3314701 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AAAD9C0D4A for ; Tue, 10 Dec 2013 07:29:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A640420351 for ; Tue, 10 Dec 2013 07:29:13 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 96FFC20340 for ; Tue, 10 Dec 2013 07:29:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DFDFBFB1A2; Mon, 9 Dec 2013 23:29:08 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from homiemail-a14.g.dreamhost.com (caiajhbdcahe.dreamhost.com [208.97.132.74]) by gabe.freedesktop.org (Postfix) with ESMTP id 8B924FB058 for ; Mon, 9 Dec 2013 23:29:04 -0800 (PST) Received: from homiemail-a14.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a14.g.dreamhost.com (Postfix) with ESMTP id 4BEAB392075; Mon, 9 Dec 2013 23:29:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=whitecape.org; h=from:to :cc:subject:date:message-id:in-reply-to:references; s= whitecape.org; bh=DG1k38gg+ncTblimx0dSGPhz3jc=; b=LqjJekxN6fWLKl Ks2p576LxWtE2J4Pmsa85Ik1aXh+8nf05asXNvMGJkvb4TJifj4qoD/caUB8ZPgG U1KToOwFgFmscp563hCNIvmecXf2kTCLprxq6C4YRuID0zvwazkQJjpTHGy0xXy7 vIXH0HwzPAYOxD84QXr/GBVreFUeU= Received: from zidane.shinigami (unknown [50.126.105.238]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: kenneth@whitecape.org) by homiemail-a14.g.dreamhost.com (Postfix) with ESMTPSA id E875F392077; Mon, 9 Dec 2013 23:29:03 -0800 (PST) From: Kenneth Graunke To: intel-gfx@lists.freedesktop.org Date: Mon, 9 Dec 2013 23:29:36 -0800 Message-Id: <1386660576-1861-2-git-send-email-kenneth@whitecape.org> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1386660576-1861-1-git-send-email-kenneth@whitecape.org> References: <1386660576-1861-1-git-send-email-kenneth@whitecape.org> Cc: Ben Widawsky Subject: [Intel-gfx] [PATCH 2/2] rendercopy/bdw: Fix length of a bunch of zeroed out packets. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A bunch of packets were too short. Signed-off-by: Kenneth Graunke Cc: Ben Widawsky Cc: Damien Lespiau --- lib/rendercopy_gen8.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) The test is still broken for me, but I figure these patches are necessary (if not sufficient) diff --git a/lib/rendercopy_gen8.c b/lib/rendercopy_gen8.c index 38dc0e7..45a134c 100644 --- a/lib/rendercopy_gen8.c +++ b/lib/rendercopy_gen8.c @@ -584,7 +584,10 @@ gen8_emit_vs(struct intel_batchbuffer *batch) { OUT_BATCH(0); OUT_BATCH(0); - OUT_BATCH(GEN6_3DSTATE_VS | (6-2)); + OUT_BATCH(GEN6_3DSTATE_VS | (9-2)); + OUT_BATCH(0); + OUT_BATCH(0); + OUT_BATCH(0); OUT_BATCH(0); OUT_BATCH(0); OUT_BATCH(0); @@ -606,7 +609,9 @@ gen8_emit_hs(struct intel_batchbuffer *batch) { OUT_BATCH(0); OUT_BATCH(0); - OUT_BATCH(GEN7_3DSTATE_HS | (7-2)); + OUT_BATCH(GEN7_3DSTATE_HS | (9-2)); + OUT_BATCH(0); + OUT_BATCH(0); OUT_BATCH(0); OUT_BATCH(0); OUT_BATCH(0); @@ -635,7 +640,10 @@ gen8_emit_gs(struct intel_batchbuffer *batch) { OUT_BATCH(0); OUT_BATCH(0); - OUT_BATCH(GEN7_3DSTATE_GS | (7-2)); + OUT_BATCH(GEN7_3DSTATE_GS | (10-2)); + OUT_BATCH(0); + OUT_BATCH(0); + OUT_BATCH(0); OUT_BATCH(0); OUT_BATCH(0); OUT_BATCH(0); @@ -664,7 +672,10 @@ gen8_emit_ds(struct intel_batchbuffer *batch) { OUT_BATCH(0); OUT_BATCH(0); - OUT_BATCH(GEN7_3DSTATE_DS | (6-2)); + OUT_BATCH(GEN7_3DSTATE_DS | (9-2)); + OUT_BATCH(0); + OUT_BATCH(0); + OUT_BATCH(0); OUT_BATCH(0); OUT_BATCH(0); OUT_BATCH(0); @@ -786,7 +797,8 @@ gen8_emit_ps(struct intel_batchbuffer *batch, uint32_t kernel) { static void gen8_emit_depth(struct intel_batchbuffer *batch) { - OUT_BATCH(GEN7_3DSTATE_DEPTH_BUFFER | (7-2)); + OUT_BATCH(GEN7_3DSTATE_DEPTH_BUFFER | (8-2)); + OUT_BATCH(0); OUT_BATCH(0); OUT_BATCH(0); OUT_BATCH(0); @@ -937,7 +949,9 @@ void gen8_render_copyfunc(struct intel_batchbuffer *batch, gen8_emit_null_state(batch); - OUT_BATCH(GEN7_3DSTATE_STREAMOUT | 1); + OUT_BATCH(GEN7_3DSTATE_STREAMOUT | (5-2)); + OUT_BATCH(0); + OUT_BATCH(0); OUT_BATCH(0); OUT_BATCH(0);