1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index e0c7bf27eafd..40a7aa4db589 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1210,7 +1210,7 @@ gen8_ring_put_irq(struct intel_ring_buffer *ring)
 
 static int
 i965_dispatch_execbuffer(struct intel_ring_buffer *ring,
-                         u32 offset, u32 length,
+                         u64 offset, u32 length,
                          unsigned flags)
 {
         int ret;
@@ -1233,7 +1233,7 @@ i965_dispatch_execbuffer(struct intel_ring_buffer *ring,
 #define I830_BATCH_LIMIT (256*1024)
 static int
 i830_dispatch_execbuffer(struct intel_ring_buffer *ring,
-                                u32 offset, u32 len,
+                                u64 offset, u32 len,
                                 unsigned flags)
 {
         int ret;
@@ -1284,7 +1284,7 @@ i830_dispatch_execbuffer(struct intel_ring_buffer *ring,
 
 static int
 i915_dispatch_execbuffer(struct intel_ring_buffer *ring,
-                         u32 offset, u32 len,
+                         u64 offset, u32 len,
                          unsigned flags)
 {
         int ret;
@@ -1797,7 +1797,7 @@ static int gen6_bsd_ring_flush(struct intel_ring_buffer *ring,
 
 static int
 gen8_ring_dispatch_execbuffer(struct intel_ring_buffer *ring,
-                              u32 offset, u32 len,
+                              u64 offset, u32 len,
                               unsigned flags)
 {
         struct drm_i915_private *dev_priv = ring->dev->dev_private;
@@ -1811,8 +1811,8 @@ gen8_ring_dispatch_execbuffer(struct intel_ring_buffer *ring,
 
         /* FIXME(BDW): Address space and security selectors. */
         intel_ring_emit(ring, MI_BATCH_BUFFER_START_GEN8 | (ppgtt<<8));
-        intel_ring_emit(ring, offset);
-        intel_ring_emit(ring, 0);
+        intel_ring_emit(ring, lower_32_bits(offset));
+        intel_ring_emit(ring, upper_32_bits(offset));
         intel_ring_emit(ring, MI_NOOP);
         intel_ring_advance(ring);
 
@@ -1821,7 +1821,7 @@ gen8_ring_dispatch_execbuffer(struct intel_ring_buffer *ring,
 
 static int
 hsw_ring_dispatch_execbuffer(struct intel_ring_buffer *ring,
-                              u32 offset, u32 len,
+                              u64 offset, u32 len,
                               unsigned flags)
 {
         int ret;
@@ -1842,7 +1842,7 @@ hsw_ring_dispatch_execbuffer(struct intel_ring_buffer *ring,
 
 static int
 gen6_ring_dispatch_execbuffer(struct intel_ring_buffer *ring,
-                              u32 offset, u32 len,
+                              u64 offset, u32 len,
                               unsigned flags)
 {
         int ret;