|
@@ -2749,18 +2749,19 @@ static void gen8_disable_vblank(struct drm_device *dev, int pipe)
|
|
|
spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
|
|
|
}
|
|
|
|
|
|
-static u32
|
|
|
-ring_last_seqno(struct intel_engine_cs *ring)
|
|
|
+static struct drm_i915_gem_request *
|
|
|
+ring_last_request(struct intel_engine_cs *ring)
|
|
|
{
|
|
|
return list_entry(ring->request_list.prev,
|
|
|
- struct drm_i915_gem_request, list)->seqno;
|
|
|
+ struct drm_i915_gem_request, list);
|
|
|
}
|
|
|
|
|
|
static bool
|
|
|
-ring_idle(struct intel_engine_cs *ring, u32 seqno)
|
|
|
+ring_idle(struct intel_engine_cs *ring)
|
|
|
{
|
|
|
return (list_empty(&ring->request_list) ||
|
|
|
- i915_seqno_passed(seqno, ring_last_seqno(ring)));
|
|
|
+ i915_seqno_passed(ring->get_seqno(ring, false),
|
|
|
+ i915_gem_request_get_seqno(ring_last_request(ring))));
|
|
|
}
|
|
|
|
|
|
static bool
|
|
@@ -2980,7 +2981,7 @@ static void i915_hangcheck_elapsed(unsigned long data)
|
|
|
acthd = intel_ring_get_active_head(ring);
|
|
|
|
|
|
if (ring->hangcheck.seqno == seqno) {
|
|
|
- if (ring_idle(ring, seqno)) {
|
|
|
+ if (ring_idle(ring)) {
|
|
|
ring->hangcheck.action = HANGCHECK_IDLE;
|
|
|
|
|
|
if (waitqueue_active(&ring->irq_queue)) {
|