mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-01-01 23:01:29 +00:00
drm/i915: Use an uncommon name for the local dev_priv in macros
Using dev_priv__ avoids sparse complaining about shadowed variables in the *LP_RING() macros. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
parent
e898cd221d
commit
dbd7ac9661
@ -1095,26 +1095,26 @@ extern int intel_trans_dp_port_sel (struct drm_crtc *crtc);
|
||||
#define I915_VERBOSE 0
|
||||
|
||||
#define BEGIN_LP_RING(n) do { \
|
||||
drm_i915_private_t *dev_priv = dev->dev_private; \
|
||||
drm_i915_private_t *dev_priv__ = dev->dev_private; \
|
||||
if (I915_VERBOSE) \
|
||||
DRM_DEBUG(" BEGIN_LP_RING %x\n", (int)(n)); \
|
||||
intel_ring_begin(dev, &dev_priv->render_ring, (n)); \
|
||||
intel_ring_begin(dev, &dev_priv__->render_ring, (n)); \
|
||||
} while (0)
|
||||
|
||||
|
||||
#define OUT_RING(x) do { \
|
||||
drm_i915_private_t *dev_priv = dev->dev_private; \
|
||||
drm_i915_private_t *dev_priv__ = dev->dev_private; \
|
||||
if (I915_VERBOSE) \
|
||||
DRM_DEBUG(" OUT_RING %x\n", (int)(x)); \
|
||||
intel_ring_emit(dev, &dev_priv->render_ring, x); \
|
||||
intel_ring_emit(dev, &dev_priv__->render_ring, x); \
|
||||
} while (0)
|
||||
|
||||
#define ADVANCE_LP_RING() do { \
|
||||
drm_i915_private_t *dev_priv = dev->dev_private; \
|
||||
drm_i915_private_t *dev_priv__ = dev->dev_private; \
|
||||
if (I915_VERBOSE) \
|
||||
DRM_DEBUG("ADVANCE_LP_RING %x\n", \
|
||||
dev_priv->render_ring.tail); \
|
||||
intel_ring_advance(dev, &dev_priv->render_ring); \
|
||||
dev_priv__->render_ring.tail); \
|
||||
intel_ring_advance(dev, &dev_priv__->render_ring); \
|
||||
} while(0)
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user