From 5de6f243738e5172953dc36f7855ae4e7c6e2964 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Fri, 24 Sep 2010 21:08:29 +0200 Subject: [PATCH] --- yaml --- r: 218107 b: refs/heads/master c: bf7e0e1268f72ea1687140603a910eeaca031fa1 h: refs/heads/master i: 218105: e6d61dc71af23bc59666034b412c61ca6f5402a5 218103: 6f066034c2b9c664242eca23b7ac0eedf6728461 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 69627aca45d1..15c21deb1edd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95375b7f9de429100b6e72df5c3abd9a3aaf266c +refs/heads/master: bf7e0e1268f72ea1687140603a910eeaca031fa1 diff --git a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c index 9b848be40572..ede436ba22d2 100644 --- a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -131,7 +131,7 @@ static unsigned int render_ring_get_active_head(struct drm_device *dev, struct intel_ring_buffer *ring) { drm_i915_private_t *dev_priv = dev->dev_private; - u32 acthd_reg = INTEL_INFO(dev)->gen ? ACTHD_I965 : ACTHD; + u32 acthd_reg = INTEL_INFO(dev)->gen >= 4 ? ACTHD_I965 : ACTHD; return I915_READ(acthd_reg); }