From patchwork Thu Mar 5 16:20:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lespiau, Damien" X-Patchwork-Id: 5947571 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5D3259FB52 for ; Thu, 5 Mar 2015 16:20:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9012C20392 for ; Thu, 5 Mar 2015 16:20:41 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id CDB4C2038D for ; Thu, 5 Mar 2015 16:20:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B9EC06E810; Thu, 5 Mar 2015 08:20:34 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id C1E286E801; Thu, 5 Mar 2015 08:20:33 -0800 (PST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP; 05 Mar 2015 08:20:33 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,347,1422950400"; d="scan'208";a="462980876" Received: from rmoore5-mobl1.amr.corp.intel.com (HELO strange.ger.corp.intel.com) ([10.252.11.84]) by FMSMGA003.fm.intel.com with ESMTP; 05 Mar 2015 08:14:12 -0800 From: Damien Lespiau To: intel-gfx@lists.freedesktop.org Subject: [PATCH 11/12] intel: Make test_decode not depend on intel_chipset.h Date: Thu, 5 Mar 2015 16:20:19 +0000 Message-Id: <1425572420-10067-12-git-send-email-damien.lespiau@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1425572420-10067-1-git-send-email-damien.lespiau@intel.com> References: <1425572420-10067-1-git-send-email-damien.lespiau@intel.com> Cc: dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 We were pulling a few PCI ids, we can just hardcode them, it doesn't change much. Signed-off-by: Damien Lespiau --- intel/test_decode.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/intel/test_decode.c b/intel/test_decode.c index 1ffd829..b9897b3 100644 --- a/intel/test_decode.c +++ b/intel/test_decode.c @@ -36,7 +36,6 @@ #include "libdrm.h" #include "intel_bufmgr.h" -#include "intel_chipset.h" #define HW_OFFSET 0x12300000 @@ -147,9 +146,9 @@ infer_devid(const char *batch_filename) { "945", 0x2772}, { "gen4", 0x2a02 }, { "gm45", 0x2a42 }, - { "gen5", PCI_CHIP_ILD_G }, - { "gen6", PCI_CHIP_SANDYBRIDGE_GT2 }, - { "gen7", PCI_CHIP_IVYBRIDGE_GT2 }, + { "gen5", 0x0042 }, + { "gen6", 0x0112 }, + { "gen7", 0x0162 }, { "gen8", 0x1616 }, { NULL, 0 }, };