From patchwork Mon Aug 29 10:31:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Weinehall X-Patchwork-Id: 9303455 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 6B7626077C for ; Mon, 29 Aug 2016 10:32:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D0D02875C for ; Mon, 29 Aug 2016 10:32:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 51F952876C; Mon, 29 Aug 2016 10:32:04 +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.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F35882875C for ; Mon, 29 Aug 2016 10:32:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5A32F6E4BD; Mon, 29 Aug 2016 10:32:03 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8CE2D6E4BD for ; Mon, 29 Aug 2016 10:32:00 +0000 (UTC) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP; 29 Aug 2016 03:32:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.28,596,1464678000"; d="scan'208"; a="1048604885" Received: from dweineha-mobl3.fi.intel.com ([10.237.72.72]) by fmsmga002.fm.intel.com with ESMTP; 29 Aug 2016 03:31:58 -0700 From: David Weinehall To: intel-gfx@lists.freedesktop.org Date: Mon, 29 Aug 2016 13:31:41 +0300 Message-Id: <20160829103152.31282-2-david.weinehall@linux.intel.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160829103152.31282-1-david.weinehall@linux.intel.com> References: <20160829103152.31282-1-david.weinehall@linux.intel.com> Cc: --dry-run@freedesktop.org Subject: [Intel-gfx] [PATCH 01/12] drm/i915: Transitional, non-polymorph, macros 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 Introduce non-polymorph versions of INTEL_INFO(), INTEL_DEVID(), and INTEL_REVID(), to help the transition to ridding the driver of the polymorph versions. These macros are only intended to be used *within* i915_drv.h, to prevent already transitioned macros from inadvertent introduction of new, non-fixed, uses. Signed-off-by: David Weinehall --- drivers/gpu/drm/i915/i915_drv.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 77a5478043e7..b544f43fc533 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2564,11 +2564,14 @@ struct drm_i915_cmd_table { __p; \ }) #define INTEL_INFO(p) (&__I915__(p)->info) +#define __INTEL_INFO(dev_priv) (dev_priv->info) #define INTEL_GEN(p) (INTEL_INFO(p)->gen) #define INTEL_DEVID(p) (INTEL_INFO(p)->device_id) +#define __INTEL_DEVID(dev_priv) (__INTEL_INFO(dev_priv)->device_id) #define REVID_FOREVER 0xff #define INTEL_REVID(p) (__I915__(p)->drm.pdev->revision) +#define __INTEL_REVID(dev_priv) (dev_priv->drm.pdev->revision) #define GEN_FOREVER (0) /*