From patchwork Wed Jun 29 11:38:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9204955 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 45E8260757 for ; Wed, 29 Jun 2016 11:39:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3801F28653 for ; Wed, 29 Jun 2016 11:39:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2CEAF28655; Wed, 29 Jun 2016 11:39:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E05AA28653 for ; Wed, 29 Jun 2016 11:39:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5D9D76E6C2; Wed, 29 Jun 2016 11:39:20 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8A3486E6C3 for ; Wed, 29 Jun 2016 11:39:17 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id r201so13630510wme.0 for ; Wed, 29 Jun 2016 04:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=reG2Q+UYzO68qBUpbSby1gJ3e6CLOqUVC/DfV9imU1U=; b=lnGIjJU+diSlLaGnIywLwvdK0rgouWSo0HnZ1mFXWOGMxb0qr1+6JsIWWdmnhKsiGS jNaPGhDMTkBB2vrTZce6uGYsooqnNo+j2Se2zrc0wRqns4XFv6xPXRP1eSuNJr6ytoo+ 6eAXtmYwmykOQsr3ok8/QjqpHHB7XzExfgNM8q6G3SNuQXPe6f1+tjl7ix9nKTi/FRBW zPpQBs3g1bRd6rU9bvqlAH1OgLg5Py/4ltOoFe3iAXRNpukgcjdeT6JXcjNXiAqqbEL/ OG+b4TkbVNIT01uJn1iywrf2OZ0JeDZYkAxrkz3KY2/Jr1w0Gp45hSjn5hByC3Hc4/ck 3s6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=reG2Q+UYzO68qBUpbSby1gJ3e6CLOqUVC/DfV9imU1U=; b=bDsqTb6tFg+tPqZY/dQopMRXy4sPFpwjyRdHVjJfxdoHyuhzcliREvkpp8YUUTjte9 SXxUiW2GTldhCA4gbR5joXdjP414zVZ3HzEI8TKAJ6e31ryc9ZADKqzvIbpOMaXXY9KF /nrbT8nJsflc4yJ5glIEWbv0XW+Y9LvteDf3OiUSaICcwKn9uGb/8Nr+YCJcaOA1s32d 6JtxgwqUvfbWvYfFRJsMix5FSyg1+8quwbfV+9Wb8N7zwuLqX6/Rp0YTz9GXQbAOliCS dLkyW3YpjYNZsNGXs5Z4WVrz/B1xaxJm1H0V0MkI6qVKxU9Wee9/6/1+v3cniao/wijm lEyQ== X-Gm-Message-State: ALyK8tLnHgnvopX5fhjLxny9IxbOB5AidlrQWi2HL/9ppFQjTVkHPds7sRRCXxfDMn3GVg== X-Received: by 10.28.189.9 with SMTP id n9mr8125904wmf.79.1467200355431; Wed, 29 Jun 2016 04:39:15 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id x10sm3297262wjj.14.2016.06.29.04.39.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jun 2016 04:39:14 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 29 Jun 2016 12:38:52 +0100 Message-Id: <1467200347-31314-2-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1467200347-31314-1-git-send-email-chris@chris-wilson.co.uk> References: <1467200347-31314-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH igt 02/17] intel_chipset: Convert IS_MOBILE to intel_device_info 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-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Chris Wilson --- lib/intel_chipset.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h index 69c878b..ce130ed 100644 --- a/lib/intel_chipset.h +++ b/lib/intel_chipset.h @@ -273,16 +273,6 @@ void intel_check_pch(void); #endif /* __GTK_DOC_IGNORE__ */ -#define IS_MOBILE(devid) ((devid) == PCI_CHIP_I855_GM || \ - (devid) == PCI_CHIP_I915_GM || \ - (devid) == PCI_CHIP_I945_GM || \ - (devid) == PCI_CHIP_I945_GME || \ - (devid) == PCI_CHIP_I965_GM || \ - (devid) == PCI_CHIP_I965_GME || \ - (devid) == PCI_CHIP_GM45_GM || IS_IGD(devid) || \ - (devid) == PCI_CHIP_IVYBRIDGE_M_GT1 || \ - (devid) == PCI_CHIP_IVYBRIDGE_M_GT2) - #define IS_G45(devid) ((devid) == PCI_CHIP_IGD_E_G || \ (devid) == PCI_CHIP_Q45_G || \ (devid) == PCI_CHIP_G45_G || \ @@ -490,6 +480,8 @@ void intel_check_pch(void); #define IS_GEN8(devid) IS_GEN(devid, 8) #define IS_GEN9(devid) IS_GEN(devid, 9) +#define IS_MOBILE(devid) (intel_device_info(devid)->is_mobile) + #define HAS_BSD_RING(devid) AT_LEAST_GEN(devid, 5) #define HAS_BLT_RING(devid) AT_LEAST_GEN(devid, 6)