[Intel-gfx] [PATCH 5/6] drm/i915: Squash gen lookup through multiple indirections inside GT access

[Paulo Zanoni]

2013/7/16 Chris Wilson <chris at chris-wilson.co.uk>:
> 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 at chris-wilson.co.uk>

Reviewed-by: Paulo Zanoni <paulo.r.zanoni at intel.com>

I also wouldn't complain if you submitted a patch changing INTEL_INFO
and friends to take dev_priv as argument.

> ---
>  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 789a596..3858484 100644
> --- a/drivers/gpu/drm/i915/intel_uncore.c
> +++ b/drivers/gpu/drm/i915/intel_uncore.c
> @@ -356,7 +356,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) \
> @@ -387,7 +387,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.3.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Paulo Zanoni