On Tue, Feb 26, 2013 at 01:05:06PM +0200, Mika Kuoppala wrote:
> In preparation for next commit, pass seqno as a parameter
> to i915_hangcheck_ring_idle as it will be used inside
> i915_hangcheck_elapsed.
>
> Signed-off-by: Mika Kuoppala <mika.kuoppala at intel.com>
> ---
> drivers/gpu/drm/i915/i915_irq.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 29037e0..4f60c87 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -1740,11 +1740,11 @@ ring_last_seqno(struct intel_ring_buffer *ring)
> struct drm_i915_gem_request, list)->seqno;
> }
>
> -static bool i915_hangcheck_ring_idle(struct intel_ring_buffer *ring, bool *err)
> +static bool i915_hangcheck_ring_idle(struct intel_ring_buffer *ring,
> + u32 ring_seqno, bool *err)
> {
> if (list_empty(&ring->request_list) ||
> - i915_seqno_passed(ring->get_seqno(ring, false),
> - ring_last_seqno(ring))) {
> + i915_seqno_passed(ring_seqno, ring_last_seqno(ring))) {
> /* Issue a wake-up to catch stuck h/w. */
> if (waitqueue_active(&ring->irq_queue)) {
> DRM_ERROR("Hangcheck timer elapsed... %s idle\n",
I think just return err. Don't bother with a bool and *err return.
> @@ -1821,7 +1821,10 @@ void i915_hangcheck_elapsed(unsigned long data)
> memset(acthd, 0, sizeof(acthd));
> idle = true;
> for_each_ring(ring, dev_priv, i) {
> - idle &= i915_hangcheck_ring_idle(ring, &err);
> + u32 seqno;
> +
> + seqno = ring->get_seqno(ring, false);
> + idle &= i915_hangcheck_ring_idle(ring, seqno, &err);
> acthd[i] = intel_ring_get_active_head(ring);
> }
>
--
Ben Widawsky, Intel Open Source Technology Center
