From patchwork Thu Feb 6 16:54:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 3597021 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 166F69F382 for ; Thu, 6 Feb 2014 16:54:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 484D020170 for ; Thu, 6 Feb 2014 16:54:51 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 71E542016C for ; Thu, 6 Feb 2014 16:54:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6E84CFB974; Thu, 6 Feb 2014 08:54:49 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qc0-f170.google.com (mail-qc0-f170.google.com [209.85.216.170]) by gabe.freedesktop.org (Postfix) with ESMTP id 52760FB974 for ; Thu, 6 Feb 2014 08:54:47 -0800 (PST) Received: by mail-qc0-f170.google.com with SMTP id e9so3676366qcy.29 for ; Thu, 06 Feb 2014 08:54:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VvUQ+uQEDRlCK1lmiwJJglEuWz2QECpk/9ATEre05BE=; b=YfZXeQ9cfzfN+1ukdo6YiQWcPEaDCxrgl2bGoruV2UEPutyBbT5FergPqEFnqKCfKR TGSRaw5zf/ASfVuG3ldDzR9G/X9MxPRhdMnXXjnCdUw0E7zRiq3bwag619/Riyhlyuma qFlYD22ilQcIh4VYPg/zA7w6kCh6ySeVhPrhcviAIoiKX38ict1fq353oD2ZD9JK/kcf 4nSeac5QQudoogxtI/+DbsRUnG0J7k93sfeT6h6Nq4KlJaEjium6SRAYYbT4WhHpoiiD qD8XPpZErQiRZrH/hgVqEmSiOIbp13U9iS6TmscxHXl+Ml5w8CEOraHI/OMYieJjf4kz Tn1Q== X-Received: by 10.224.79.133 with SMTP id p5mr14383824qak.56.1391705686889; Thu, 06 Feb 2014 08:54:46 -0800 (PST) Received: from localhost.localdomain ([189.67.6.8]) by mx.google.com with ESMTPSA id d7sm4013362qad.10.2014.02.06.08.54.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Feb 2014 08:54:32 -0800 (PST) From: Rodrigo Vivi To: intel-gfx@lists.freedesktop.org Date: Thu, 6 Feb 2014 14:54:25 -0200 Message-Id: <1391705667-13122-2-git-send-email-rodrigo.vivi@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1391705667-13122-1-git-send-email-rodrigo.vivi@gmail.com> References: <1391705667-13122-1-git-send-email-rodrigo.vivi@gmail.com> Subject: [Intel-gfx] [PATCH 2/4] tests/gem_wait_render_timeout: Fix for BDW 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.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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 Update XY_COLOR_BLT command for Broadwell. Signed-off-by: Rodrigo Vivi --- tests/gem_wait_render_timeout.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/gem_wait_render_timeout.c b/tests/gem_wait_render_timeout.c index 4ecb93f..9fe6910 100644 --- a/tests/gem_wait_render_timeout.c +++ b/tests/gem_wait_render_timeout.c @@ -86,9 +86,17 @@ static void blt_color_fill(struct intel_batchbuffer *batch, { const unsigned short height = pages/4; const unsigned short width = 4096; - BEGIN_BATCH(6); - OUT_BATCH(XY_COLOR_BLT_CMD_NOLEN | 4 | - COLOR_BLT_WRITE_ALPHA | XY_COLOR_BLT_WRITE_RGB); + + if (intel_gen(batch->devid) >= 8) { + BEGIN_BATCH(8); + OUT_BATCH(MI_NOOP); + OUT_BATCH(XY_COLOR_BLT_CMD_NOLEN | 5 | + COLOR_BLT_WRITE_ALPHA | XY_COLOR_BLT_WRITE_RGB); + } else { + BEGIN_BATCH(6); + OUT_BATCH(XY_COLOR_BLT_CMD_NOLEN | 4 | + COLOR_BLT_WRITE_ALPHA | XY_COLOR_BLT_WRITE_RGB); + } OUT_BATCH((3 << 24) | /* 32 Bit Color */ (0xF0 << 16) | /* Raster OP copy background register */ 0); /* Dest pitch is 0 */ @@ -96,6 +104,8 @@ static void blt_color_fill(struct intel_batchbuffer *batch, OUT_BATCH(width << 16 | height); OUT_RELOC(buf, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0); + if (intel_gen(batch->devid) >= 8) + OUT_BATCH(0); OUT_BATCH(rand()); /* random pattern */ ADVANCE_BATCH(); }