| From 825b81dd06095d52bf121707f4cb1677ceec0433 Mon Sep 17 00:00:00 2001 |
| From: Chris Wilson <chris@chris-wilson.co.uk> |
| Date: Fri, 19 Jul 2013 20:36:55 +0100 |
| Subject: drm/i915: Squash gen lookup through multiple indirections inside GT |
| access |
| |
| The INTEL_INFO() macro extracts the dev_private pointer from the device, |
| so passing in the dev_private->dev is a long winded circumlocution. |
| |
| v2: rebase onto uncore |
| |
| Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit a7f31ee0b00203fcf47fb74a1d61a1c9be8d142e) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_uncore.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c |
| index 2dcf682d8dad..89bb9da377fc 100644 |
| --- a/drivers/gpu/drm/i915/intel_uncore.c |
| +++ b/drivers/gpu/drm/i915/intel_uncore.c |
| @@ -347,7 +347,7 @@ u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg, bool trace) { \ |
| unsigned long irqflags; \ |
| u##x val = 0; \ |
| spin_lock_irqsave(&dev_priv->uncore.lock, irqflags); \ |
| - if (IS_GEN5(dev_priv->dev)) \ |
| + if (dev_priv->info->gen == 5) \ |
| ilk_dummy_write(dev_priv); \ |
| if (NEEDS_FORCE_WAKE((dev_priv), (reg))) { \ |
| if (dev_priv->uncore.forcewake_count == 0) \ |
| @@ -378,7 +378,7 @@ void i915_write##x(struct drm_i915_private *dev_priv, u32 reg, u##x val, bool tr |
| if (NEEDS_FORCE_WAKE((dev_priv), (reg))) { \ |
| __fifo_ret = __gen6_gt_wait_for_fifo(dev_priv); \ |
| } \ |
| - if (IS_GEN5(dev_priv->dev)) \ |
| + if (dev_priv->info->gen == 5) \ |
| ilk_dummy_write(dev_priv); \ |
| hsw_unclaimed_reg_clear(dev_priv, reg); \ |
| __raw_i915_write##x(dev_priv, reg, val); \ |
| -- |
| 1.8.5.rc3 |
| |
