[PATCH 1/1] drm/i915: use gem_set_seqno() on hardware init

[PATCH 1/1] drm/i915: use gem_set_seqno() on hardware init

[Mika Kuoppala]

When machine was rebooted or module was reloaded,
gem_hw_init() set last_seqno to be identical to next_seqno.
This lead to situation that waits for first ever request
always passed immediately regardless if it was actually
executed.

Use gem_set_seqno() to be consistent how hw is
initialized on init, wrap and on resume.

Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
---
 drivers/gpu/drm/i915/i915_gem.c         |    6 ++++--
 drivers/gpu/drm/i915/intel_ringbuffer.c |    2 --
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index d90d2f9..1a61d99 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3979,8 +3979,6 @@ i915_gem_init_hw(struct drm_device *dev)
 
 	i915_gem_init_swizzling(dev);
 
-	dev_priv->next_seqno = dev_priv->last_seqno = (u32)~0 - 0x1000;
-
 	ret = intel_init_render_ring_buffer(dev);
 	if (ret)
 		return ret;
@@ -3997,6 +3995,10 @@ i915_gem_init_hw(struct drm_device *dev)
 			goto cleanup_bsd_ring;
 	}
 
+	ret = i915_gem_set_seqno(dev, ((u32)~0 - 0x1000));
+	if (ret)
+		return ret;
+
 	/*
 	 * XXX: There was some w/a described somewhere suggesting loading
 	 * contexts before PPGTT.
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 2bd074a..1bb2ec5 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1184,8 +1184,6 @@ static int intel_init_ring_buffer(struct drm_device *dev,
 	if (IS_I830(ring->dev) || IS_845G(ring->dev))
 		ring->effective_size -= 128;
 
-	intel_ring_init_seqno(ring, dev_priv->last_seqno);
-
 	return 0;
 
 err_unmap:
-- 
1.7.9.5

Re: [PATCH 1/1] drm/i915: use gem_set_seqno() on hardware init

[Chris Wilson]

On Tue, Jan 22, 2013 at 02:12:17PM +0200, Mika Kuoppala wrote:
> When machine was rebooted or module was reloaded,
> gem_hw_init() set last_seqno to be identical to next_seqno.
> This lead to situation that waits for first ever request
> always passed immediately regardless if it was actually
> executed.
> 
> Use gem_set_seqno() to be consistent how hw is
> initialized on init, wrap and on resume.

Nice catch, and you caught the only other side-effect I could spot of
moving the seqno init, so

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

Re: [PATCH 1/1] drm/i915: use gem_set_seqno() on hardware init

[Daniel Vetter]

On Tue, Jan 22, 2013 at 12:28:16PM +0000, Chris Wilson wrote:
> On Tue, Jan 22, 2013 at 02:12:17PM +0200, Mika Kuoppala wrote:
> > When machine was rebooted or module was reloaded,
> > gem_hw_init() set last_seqno to be identical to next_seqno.
> > This lead to situation that waits for first ever request
> > always passed immediately regardless if it was actually
> > executed.
> > 
> > Use gem_set_seqno() to be consistent how hw is
> > initialized on init, wrap and on resume.
> 
> Nice catch, and you caught the only other side-effect I could spot of
> moving the seqno init, so
> 
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

Queued for -next, thanks for the patch.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch