Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7f31ee0 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent dba8e41f

drivers/gpu/drm/i915/intel_uncore.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -347,7 +347,7 @@ u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg, bool trace) { \ 
	unsigned long irqflags; \

	unsigned long irqflags; \

	u##x val = 0; \

	u##x val = 0; \

	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags); \

	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); \

		ilk_dummy_write(dev_priv); \

	if (NEEDS_FORCE_WAKE((dev_priv), (reg))) { \

	if (NEEDS_FORCE_WAKE((dev_priv), (reg))) { \

		if (dev_priv->uncore.forcewake_count == 0) \

		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))) { \

	if (NEEDS_FORCE_WAKE((dev_priv), (reg))) { \

		__fifo_ret = __gen6_gt_wait_for_fifo(dev_priv); \

		__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); \

		ilk_dummy_write(dev_priv); \

	hsw_unclaimed_reg_clear(dev_priv, reg); \

	hsw_unclaimed_reg_clear(dev_priv, reg); \

	__raw_i915_write##x(dev_priv, reg, val); \

	__raw_i915_write##x(dev_priv, reg, val); \