From patchwork Wed May 21 18:42:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 4218431 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9EBCF9F387 for ; Wed, 21 May 2014 18:43:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C0C6120375 for ; Wed, 21 May 2014 18:43:01 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E5D0020379 for ; Wed, 21 May 2014 18:43:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 78EDF6EAB2; Wed, 21 May 2014 11:43:00 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from gproxy3-pub.mail.unifiedlayer.com (gproxy3-pub.mail.unifiedlayer.com [69.89.30.42]) by gabe.freedesktop.org (Postfix) with SMTP id 7EDCB6EAB2 for ; Wed, 21 May 2014 11:42:58 -0700 (PDT) Received: (qmail 25228 invoked by uid 0); 21 May 2014 18:42:55 -0000 Received: from unknown (HELO cmgw2) (10.0.90.83) by gproxy3.mail.unifiedlayer.com with SMTP; 21 May 2014 18:42:55 -0000 Received: from box514.bluehost.com ([74.220.219.114]) by cmgw2 with id 4iim1o0122UhLwi01iipla; Wed, 21 May 2014 12:42:54 -0600 X-Authority-Analysis: v=2.1 cv=Q9RBveGa c=1 sm=1 tr=0 a=9W6Fsu4pMcyimqnCr1W0/w==:117 a=9W6Fsu4pMcyimqnCr1W0/w==:17 a=cNaOj0WVAAAA:8 a=f5113yIGAAAA:8 a=SdFYH6TOfo8A:10 a=3ROhxo7VqVMA:10 a=TBVoxVdAAAAA:8 a=GhZ5P8ky69gA:10 a=noBwr2J6l1kA:10 a=vquP6Z4dDQiKQspHZOwA:9 a=rW6DTWptwo0A:10 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuousgeek.org; s=default; h=Message-Id:Date:Subject:To:From; bh=kNRtl9gE6Uunjkiz8LJ2kQ2WYCW8uA57EgEPFPoQwWk=; b=N/7dD2eHCOa6uU/Fubn0MDWyOFXQr0LsTGDTCujX2btBzHaeLE5MPqdSHJmRDtzf3L8ZkSGaX+5+SgXbQkSwqAYruJdy/I0W397uoxaMx+1Vv4wMaooryfpbcJL+ux0O; Received: from [67.161.37.189] (port=48619 helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.82) (envelope-from ) id 1WnBTT-0004nn-NC for intel-gfx@lists.freedesktop.org; Wed, 21 May 2014 12:42:47 -0600 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Wed, 21 May 2014 11:42:25 -0700 Message-Id: <1400697746-7511-1-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.8.4.2 X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.161.37.189 authed with jbarnes@virtuousgeek.org} Subject: [Intel-gfx] [PATCH 1/2] drm/i915: add stepping macro 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.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 In some cases to enable or disable features & workarounds, we may need to check the GPU stepping. Add a macro to do that based on caching the PCI revision ID reg. Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/i915_dma.c | 2 ++ drivers/gpu/drm/i915/i915_drv.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index dea455b..9bcbbf2 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1565,6 +1565,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) device_info = (struct intel_device_info *)&dev_priv->info; *device_info = *info; + pci_read_config_byte(dev->pdev, PCI_REVISION_ID, &dev_priv->stepping); + spin_lock_init(&dev_priv->irq_lock); spin_lock_init(&dev_priv->gpu_error.lock); spin_lock_init(&dev_priv->backlight_lock); diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 5d5e57d..22d57b8 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1341,6 +1341,7 @@ struct drm_i915_private { struct kmem_cache *slab; const struct intel_device_info info; + u8 stepping; int relative_constants_mode; @@ -1867,6 +1868,7 @@ struct drm_i915_cmd_table { }; #define INTEL_INFO(dev) (&to_i915(dev)->info) +#define INTEL_STEPPING(dev) (&to_i915(dev)->stepping) #define IS_I830(dev) ((dev)->pdev->device == 0x3577) #define IS_845G(dev) ((dev)->pdev->device == 0x2562)