From patchwork Thu Sep 3 09:05:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Wood X-Patchwork-Id: 7115501 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6F0BFBEEC1 for ; Thu, 3 Sep 2015 09:14:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9FC8D2080D for ; Thu, 3 Sep 2015 09:14:42 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id BB4002080C for ; Thu, 3 Sep 2015 09:14:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 43AE36E0B4; Thu, 3 Sep 2015 02:14:41 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 592FD6E0B4 for ; Thu, 3 Sep 2015 02:14:40 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP; 03 Sep 2015 02:14:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,461,1437462000"; d="scan'208";a="637686866" Received: from otc-vmt1.isw.intel.com ([10.237.224.80]) by orsmga003.jf.intel.com with ESMTP; 03 Sep 2015 02:14:37 -0700 From: Thomas Wood To: intel-gfx@lists.freedesktop.org Date: Thu, 3 Sep 2015 10:05:28 +0100 Message-Id: <1441271128-12165-2-git-send-email-thomas.wood@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1441271128-12165-1-git-send-email-thomas.wood@intel.com> References: <1441271128-12165-1-git-send-email-thomas.wood@intel.com> Organization: Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ Subject: [Intel-gfx] [PATCH i-g-t 2/2] tests/gem_storedw_loop: remove redundant ppgtt check X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, 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 All tests require ppgtt, so checking for it later on has no effect. Signed-off-by: Thomas Wood --- tests/gem_storedw_loop.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/gem_storedw_loop.c b/tests/gem_storedw_loop.c index 1bb276e..08a6ad6 100644 --- a/tests/gem_storedw_loop.c +++ b/tests/gem_storedw_loop.c @@ -45,7 +45,6 @@ IGT_TEST_DESCRIPTION("Basic CS check using MI_STORE_DATA_IMM."); static drm_intel_bufmgr *bufmgr; struct intel_batchbuffer *batch; static drm_intel_bo *target_buffer; -static int has_ppgtt = 0; static int devid; /* @@ -57,8 +56,6 @@ emit_store_dword_imm(drm_intel_bo *dest, uint32_t val) { int cmd; cmd = MI_STORE_DWORD_IMM; - if (!has_ppgtt) - cmd |= MI_MEM_VIRTUAL; BEGIN_BATCH(4, 0); OUT_BATCH(cmd); @@ -163,14 +160,12 @@ igt_main bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); igt_assert(bufmgr); - has_ppgtt = gem_uses_aliasing_ppgtt(fd); - igt_skip_on_f(intel_gen(devid) < 6, "MI_STORE_DATA can only use GTT address on gen4+/g33 and " "needs snoopable mem on pre-gen6\n"); /* This only works with ppgtt */ - igt_require(has_ppgtt); + igt_require(gem_uses_aliasing_ppgtt(fd)); } for (i = 0; i < ARRAY_SIZE(rings); i++) {