| Message ID | 20160829103152.31282-2-david.weinehall@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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) /*
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 <david.weinehall@linux.intel.com> --- drivers/gpu/drm/i915/i915_drv.h | 3 +++ 1 file changed, 3 insertions(+)