From patchwork Tue Mar 18 14:18:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 3848301 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 8C859BF540 for ; Tue, 18 Mar 2014 14:19:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A26D620260 for ; Tue, 18 Mar 2014 14:19:12 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 7A8A620256 for ; Tue, 18 Mar 2014 14:19:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 161EE8D772; Tue, 18 Mar 2014 07:19:11 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pd0-f169.google.com (mail-pd0-f169.google.com [209.85.192.169]) by gabe.freedesktop.org (Postfix) with ESMTP id 177EE8D772 for ; Tue, 18 Mar 2014 07:19:10 -0700 (PDT) Received: by mail-pd0-f169.google.com with SMTP id fp1so7197165pdb.0 for ; Tue, 18 Mar 2014 07:19:09 -0700 (PDT) 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=kkKagOSu05eZvzwahMg/f+jNgdOi9yHWA/7Qnozu5cg=; b=I0DjseVS6pWDgbfN1vf3w18FJRwe1t0BuB7HEqF0t06AC1JVrNtPFjdnN4jaR4+FoZ JRz3RP+aMrBnuIUBrUPsIyyPaDe0UphffuxS70wNan0S4JefLw9bzP8V7jmovmqdMqYk TVjnMckRSxf6BJW5VJyxySiWOvHqZzDPLk+venam4dT5gAcCrCzzjWDIZCM38lg/zrAC zl34HMYgnVwiZb729jIwgYMlWYcphXEf+8NZQOivIE9qbhhj70QE3Jg1DyyeRFNMms/d DjtehS10DysZpJQvFJRJuN1XkuzJI+R/xWF2v2qVrg9jTBVq6frIT5MvKOOvImfkj77W yCBw== X-Received: by 10.68.229.68 with SMTP id so4mr33330876pbc.110.1395152349846; Tue, 18 Mar 2014 07:19:09 -0700 (PDT) Received: from localhost (jfdmzpr05-ext.jf.intel.com. [134.134.139.74]) by mx.google.com with ESMTPSA id ac5sm53115467pbc.37.2014.03.18.07.19.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Mar 2014 07:19:05 -0700 (PDT) From: Rodrigo Vivi To: intel-gfx@lists.freedesktop.org Date: Tue, 18 Mar 2014 11:18:54 -0300 Message-Id: <1395152336-7914-2-git-send-email-rodrigo.vivi@gmail.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1395152336-7914-1-git-send-email-rodrigo.vivi@gmail.com> References: <1395152336-7914-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.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 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(); }