From patchwork Tue Apr 23 07:06:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhong.li@intel.com X-Patchwork-Id: 2476031 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 5DDBEDF2E5 for ; Tue, 23 Apr 2013 07:34:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 38AEAE600A for ; Tue, 23 Apr 2013 00:34:12 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id CD2E8E5E9B for ; Tue, 23 Apr 2013 00:29:33 -0700 (PDT) Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 23 Apr 2013 00:07:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,531,1363158000"; d="scan'208";a="290202124" Received: from blue-shark-bay-client-platform.sh.intel.com ([10.239.36.73]) by azsmga001.ch.intel.com with ESMTP; 23 Apr 2013 00:07:20 -0700 From: Zhong Li To: intel-gfx@lists.freedesktop.org Date: Tue, 23 Apr 2013 15:06:42 +0800 Message-Id: <1366700809-18143-3-git-send-email-zhong.li@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1366700809-18143-1-git-send-email-zhong.li@intel.com> References: <1366700809-18143-1-git-send-email-zhong.li@intel.com> Cc: benjamin.widawsky@intel.com, daniel.vetter@intel.com Subject: [Intel-gfx] [PATCH 2/8] gem_ring_sync_loop: test the new ring 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+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org From: "Xiang, Haihao" The code is surround by a #ifdef...#endif to avoid to break compiling against the current libdrm release Signed-off-by: Xiang, Haihao Signed-off-by: Zhong Li --- tests/gem_ring_sync_loop.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/gem_ring_sync_loop.c b/tests/gem_ring_sync_loop.c index 2875cf3..955bf34 100644 --- a/tests/gem_ring_sync_loop.c +++ b/tests/gem_ring_sync_loop.c @@ -81,6 +81,18 @@ get_num_rings(int fd) else goto skip; +#ifdef I915_PARAM_HAS_VEBOX /* remove it once the upstream libdrm support VEBOX */ + + gp.param = I915_PARAM_HAS_VEBOX; + ret = drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp); + + if ((ret == 0) & (*gp.value > 0)) + num_rings++; + else + goto skip; + +#endif + skip: return num_rings; }