From 24cc09fafa12772cae56f6a5667bc7ce80ad0d2a Mon Sep 17 00:00:00 2001 From: Mika Kuoppala Date: Mon, 29 Oct 2012 16:59:26 +0200 Subject: [PATCH] --- yaml --- r: 345221 b: refs/heads/master c: 17f10fdc010254b8e9c0f1779abdaaee4757cabf h: refs/heads/master i: 345219: 9453daa4d9a963bc7fbf0f0343c4371f21369ad9 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b1324126b420..59a42537c078 100644 --- 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 index 785df4fbff21..b13393b593b8 100644 --- 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);