From 7dae17a430c236e7ab4fc2baa6c6f8f4b09756c0 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Thu, 22 Mar 2012 14:38:43 -0700 Subject: [PATCH] --- yaml --- r: 306977 b: refs/heads/master c: b7d84096d3c45f4e397e913da4ce24ec9a32022e h: refs/heads/master i: 306975: c3ac899d106ff8c7a530af8b6e02affa7f5fdf9c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_drv.c | 6 ++++++ trunk/drivers/gpu/drm/i915/i915_drv.h | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 5ea0295c4b5d..2c7a31bcdf5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a14917eeb2cc160d13f4fddefe5f7f9c80953ce1 +refs/heads/master: b7d84096d3c45f4e397e913da4ce24ec9a32022e diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c index 8e2c52ec5a9e..9a7f265db1a4 100644 --- a/trunk/drivers/gpu/drm/i915/i915_drv.c +++ b/trunk/drivers/gpu/drm/i915/i915_drv.c @@ -985,6 +985,12 @@ MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE("GPL and additional rights"); +/* We give fast paths for the really cool registers */ +#define NEEDS_FORCE_WAKE(dev_priv, reg) \ + (((dev_priv)->info->gen >= 6) && \ + ((reg) < 0x40000) && \ + ((reg) != FORCEWAKE)) + #define __i915_read(x, y) \ u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg) { \ u##x val = 0; \ diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.h b/trunk/drivers/gpu/drm/i915/i915_drv.h index f2f9dd933ce4..e16f4d6f235e 100644 --- a/trunk/drivers/gpu/drm/i915/i915_drv.h +++ b/trunk/drivers/gpu/drm/i915/i915_drv.h @@ -1435,12 +1435,6 @@ void gen6_gt_force_wake_get(struct drm_i915_private *dev_priv); void gen6_gt_force_wake_put(struct drm_i915_private *dev_priv); int __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv); -/* We give fast paths for the really cool registers */ -#define NEEDS_FORCE_WAKE(dev_priv, reg) \ - (((dev_priv)->info->gen >= 6) && \ - ((reg) < 0x40000) && \ - ((reg) != FORCEWAKE)) - #define __i915_read(x, y) \ u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg);