From 7be41f7f8778661750e8ac7df8944beabf921395 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 4 Aug 2010 15:18:14 +0100
Subject: [PATCH] --- yaml --- r: 209727 b: refs/heads/master c:
 e898cd221db65273bfc102fa20e4e228e0b8c7e1 h: refs/heads/master i:   209725:
 cd1129022f161d07acc9710ba5c86154b666c471   209723:
 b77a73e642358992fba697d759e35cc63d592007   209719:
 3fb711adadc3938910efc2b18d568d70a0060394   209711:
 e6da7aedb65b9633a1601383bbb66a650a184404   209695:
 fdba08ef5378f11f9a872b87c99b9476fc77de87   209663:
 715826f480c9f00e542488fab23b393d17be0634 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/gpu/drm/i915/intel_ringbuffer.c |  8 --------
 trunk/drivers/gpu/drm/i915/intel_ringbuffer.h | 12 ++++++++++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index cfa4fd0572f4..c0861046404a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d97ed3396399126cfca1e12e2b2e2d8bbc4924e5
+refs/heads/master: e898cd221db65273bfc102fa20e4e228e0b8c7e1
diff --git a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
index 7ab72af045ec..a5d664e0b176 100644
--- a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -735,14 +735,6 @@ void intel_ring_begin(struct drm_device *dev,
 	ring->space -= n;
 }
 
-void intel_ring_emit(struct drm_device *dev,
-		struct intel_ring_buffer *ring, unsigned int data)
-{
-	unsigned int *virt = ring->virtual_start + ring->tail;
-	*virt = data;
-	ring->tail += 4;
-}
-
 void intel_ring_advance(struct drm_device *dev,
 		struct intel_ring_buffer *ring)
 {
diff --git a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.h b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.h
index d5568d3766de..9b67eead187e 100644
--- a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -106,8 +106,16 @@ int intel_wrap_ring_buffer(struct drm_device *dev,
 		struct intel_ring_buffer *ring);
 void intel_ring_begin(struct drm_device *dev,
 		struct intel_ring_buffer *ring, int n);
-void intel_ring_emit(struct drm_device *dev,
-		struct intel_ring_buffer *ring, u32 data);
+
+static inline void intel_ring_emit(struct drm_device *dev,
+				   struct intel_ring_buffer *ring,
+				   unsigned int data)
+{
+	unsigned int *virt = ring->virtual_start + ring->tail;
+	*virt = data;
+	ring->tail += 4;
+}
+
 void intel_fill_struct(struct drm_device *dev,
 		struct intel_ring_buffer *ring,
 		void *data,