lkml.org 
[lkml]   [2012]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 16/48] drm/i915: Do the fallback non-IRQ wait in ring throttle, too.
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Eric Anholt <eric@anholt.net>

    commit 7ea29b13e5e3e1e61e612349eb0366efdb6457f3 upstream.

    As a workaround for IRQ synchronization issues in the gen7 BLT ring,
    we want to turn the two wait functions into polling loops.

    Signed-off-by: Eric Anholt <eric@anholt.net>
    Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
    Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
    Acked-by: Kenneth Graunke <kenneth@whitecape.org>
    Signed-off-by: Keith Packard <keithp@keithp.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/gpu/drm/i915/i915_gem.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
    index 8359dc7..66e0a55 100644
    --- a/drivers/gpu/drm/i915/i915_gem.c
    +++ b/drivers/gpu/drm/i915/i915_gem.c
    @@ -3309,6 +3309,10 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file)

    if (ret == 0 && atomic_read(&dev_priv->mm.wedged))
    ret = -EIO;
    + } else if (wait_for(i915_seqno_passed(ring->get_seqno(ring),
    + seqno) ||
    + atomic_read(&dev_priv->mm.wedged), 3000)) {
    + ret = -EBUSY;
    }
    }




    \
     
     \ /
      Last update: 2012-07-01 21:22    [W:0.021 / U:0.684 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site