diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-09-24 21:08:29 +0200 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-25 12:23:14 +0100 |
| commit | bf7e0e1268f72ea1687140603a910eeaca031fa1 (patch) | |
| tree | 73ed9fd08d9bfc987abfc4f62d45906c25201ce1 | |
| parent | 95375b7f9de429100b6e72df5c3abd9a3aaf266c (diff) | |
| download | op-kernel-dev-bf7e0e1268f72ea1687140603a910eeaca031fa1.zip op-kernel-dev-bf7e0e1268f72ea1687140603a910eeaca031fa1.tar.gz | |
drm/i915: fix ACTHD for gen <= 3
This was mixed up in the following patch:
commit a6c45cf013a57e32ddae43dd4ac911eb4a3919fd
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Sep 17 00:32:17 2010 +0100
drm/i915: INTEL_INFO->gen supercedes i8xx, i9xx, i965g
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 9b848be..ede436b 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/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); } |
