Commit 99433931 authored by Mika Kuoppala's avatar Mika Kuoppala Committed by Daniel Vetter

drm/i915: use gem_set_seqno() on hardware init

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: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5559ecad
...@@ -3941,8 +3941,6 @@ i915_gem_init_hw(struct drm_device *dev) ...@@ -3941,8 +3941,6 @@ i915_gem_init_hw(struct drm_device *dev)
i915_gem_init_swizzling(dev); i915_gem_init_swizzling(dev);
dev_priv->next_seqno = dev_priv->last_seqno = (u32)~0 - 0x1000;
ret = intel_init_render_ring_buffer(dev); ret = intel_init_render_ring_buffer(dev);
if (ret) if (ret)
return ret; return ret;
...@@ -3959,6 +3957,10 @@ i915_gem_init_hw(struct drm_device *dev) ...@@ -3959,6 +3957,10 @@ i915_gem_init_hw(struct drm_device *dev)
goto cleanup_bsd_ring; 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 * XXX: There was some w/a described somewhere suggesting loading
* contexts before PPGTT. * contexts before PPGTT.
......
...@@ -1223,8 +1223,6 @@ static int intel_init_ring_buffer(struct drm_device *dev, ...@@ -1223,8 +1223,6 @@ static int intel_init_ring_buffer(struct drm_device *dev,
if (IS_I830(ring->dev) || IS_845G(ring->dev)) if (IS_I830(ring->dev) || IS_845G(ring->dev))
ring->effective_size -= 128; ring->effective_size -= 128;
intel_ring_init_seqno(ring, dev_priv->last_seqno);
return 0; return 0;
err_unmap: err_unmap:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment