diff options
author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-03-22 17:38:43 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-03-23 18:45:50 -0400 |
commit | b7d84096d3c45f4e397e913da4ce24ec9a32022e (patch) | |
tree | a516f361d8320d5ebcb9346992b0606724b429cc /drivers/gpu/drm | |
parent | a14917eeb2cc160d13f4fddefe5f7f9c80953ce1 (diff) |
drm/i915: move NEEDS_FORCE_WAKE to i915_drv.c
It's only used by the main read/write functions, so we can keep it with
them.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Acked-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 8e2c52ec5a9e..9a7f265db1a4 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
@@ -985,6 +985,12 @@ MODULE_AUTHOR(DRIVER_AUTHOR); | |||
985 | MODULE_DESCRIPTION(DRIVER_DESC); | 985 | MODULE_DESCRIPTION(DRIVER_DESC); |
986 | MODULE_LICENSE("GPL and additional rights"); | 986 | MODULE_LICENSE("GPL and additional rights"); |
987 | 987 | ||
988 | /* We give fast paths for the really cool registers */ | ||
989 | #define NEEDS_FORCE_WAKE(dev_priv, reg) \ | ||
990 | (((dev_priv)->info->gen >= 6) && \ | ||
991 | ((reg) < 0x40000) && \ | ||
992 | ((reg) != FORCEWAKE)) | ||
993 | |||
988 | #define __i915_read(x, y) \ | 994 | #define __i915_read(x, y) \ |
989 | u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg) { \ | 995 | u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg) { \ |
990 | u##x val = 0; \ | 996 | u##x val = 0; \ |
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index f2f9dd933ce4..e16f4d6f235e 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -1435,12 +1435,6 @@ void gen6_gt_force_wake_get(struct drm_i915_private *dev_priv); | |||
1435 | void gen6_gt_force_wake_put(struct drm_i915_private *dev_priv); | 1435 | void gen6_gt_force_wake_put(struct drm_i915_private *dev_priv); |
1436 | int __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv); | 1436 | int __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv); |
1437 | 1437 | ||
1438 | /* We give fast paths for the really cool registers */ | ||
1439 | #define NEEDS_FORCE_WAKE(dev_priv, reg) \ | ||
1440 | (((dev_priv)->info->gen >= 6) && \ | ||
1441 | ((reg) < 0x40000) && \ | ||
1442 | ((reg) != FORCEWAKE)) | ||
1443 | |||
1444 | #define __i915_read(x, y) \ | 1438 | #define __i915_read(x, y) \ |
1445 | u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg); | 1439 | u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg); |
1446 | 1440 | ||