aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index e7fb37995652..5cd593f826ef 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1095,26 +1095,26 @@ extern int intel_trans_dp_port_sel (struct drm_crtc *crtc);
1095#define I915_VERBOSE 0 1095#define I915_VERBOSE 0
1096 1096
1097#define BEGIN_LP_RING(n) do { \ 1097#define BEGIN_LP_RING(n) do { \
1098 drm_i915_private_t *dev_priv = dev->dev_private; \ 1098 drm_i915_private_t *dev_priv__ = dev->dev_private; \
1099 if (I915_VERBOSE) \ 1099 if (I915_VERBOSE) \
1100 DRM_DEBUG(" BEGIN_LP_RING %x\n", (int)(n)); \ 1100 DRM_DEBUG(" BEGIN_LP_RING %x\n", (int)(n)); \
1101 intel_ring_begin(dev, &dev_priv->render_ring, (n)); \ 1101 intel_ring_begin(dev, &dev_priv__->render_ring, (n)); \
1102} while (0) 1102} while (0)
1103 1103
1104 1104
1105#define OUT_RING(x) do { \ 1105#define OUT_RING(x) do { \
1106 drm_i915_private_t *dev_priv = dev->dev_private; \ 1106 drm_i915_private_t *dev_priv__ = dev->dev_private; \
1107 if (I915_VERBOSE) \ 1107 if (I915_VERBOSE) \
1108 DRM_DEBUG(" OUT_RING %x\n", (int)(x)); \ 1108 DRM_DEBUG(" OUT_RING %x\n", (int)(x)); \
1109 intel_ring_emit(dev, &dev_priv->render_ring, x); \ 1109 intel_ring_emit(dev, &dev_priv__->render_ring, x); \
1110} while (0) 1110} while (0)
1111 1111
1112#define ADVANCE_LP_RING() do { \ 1112#define ADVANCE_LP_RING() do { \
1113 drm_i915_private_t *dev_priv = dev->dev_private; \ 1113 drm_i915_private_t *dev_priv__ = dev->dev_private; \
1114 if (I915_VERBOSE) \ 1114 if (I915_VERBOSE) \
1115 DRM_DEBUG("ADVANCE_LP_RING %x\n", \ 1115 DRM_DEBUG("ADVANCE_LP_RING %x\n", \
1116 dev_priv->render_ring.tail); \ 1116 dev_priv__->render_ring.tail); \
1117 intel_ring_advance(dev, &dev_priv->render_ring); \ 1117 intel_ring_advance(dev, &dev_priv__->render_ring); \
1118} while(0) 1118} while(0)
1119 1119
1120/** 1120/**