Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf7e0e12 authored by Daniel Vetter's avatar Daniel Vetter Committed by Chris Wilson
Browse files

drm/i915: fix ACTHD for gen <= 3 



This was mixed up in the following patch:

commit a6c45cf0
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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 95375b7f

drivers/gpu/drm/i915/intel_ringbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}