---

yaml --- r: 345221 b: refs/heads/master c: 17f10fd h: refs/heads/master i: 345219: 9453daa v: v3
git-mirror · Nov 11, 2012 · 24cc09f · 24cc09f
1 parent 153402e
commit 24cc09f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00c09d70df6b30c980f20facc1db3def3f5a637e
+refs/heads/master: 17f10fdc010254b8e9c0f1779abdaaee4757cabf
diff --git a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1590,7 +1590,7 @@ int intel_render_ring_init_dri(struct drm_device *dev, u64 start, u32 size)
 
 	ring->size = size;
 	ring->effective_size = ring->size;
-	if (IS_I830(ring->dev))
+	if (IS_I830(ring->dev) || IS_845G(ring->dev))
 		ring->effective_size -= 128;
 
 	ring->virtual_start = ioremap_wc(start, size);