drm/i915: Convert 'ring_idle()' to use requests not seqnos

johnharr-intel · danvet · commit 44cdd6d219bc · 2014-12-03T09:35:21.000+01:00
More seqno value to request structure conversions. Note, this change temporarily
moves the 'get_seqno()' call inside ring_idle() but this will disappear again in
a later patch when i915_seqno_passed() itself is converted.

For: VIZ-4377
Signed-off-by: John Harrison &lt;John.C.Harrison@Intel.com&gt;
Reviewed-by: Thomas Daniel &lt;Thomas.Daniel@intel.com&gt;
Signed-off-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt;
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
@@ -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)) {

Original file line number	Diff line number	Diff line change
`@@ -2749,18 +2749,19 @@ static void gen8_disable_vblank(struct drm_device *dev, int pipe)`
`2749`	`2749`	`spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);`
`2750`	`2750`	`}`
`2751`	`2751`
`2752`		`-static u32`
`2753`		`-ring_last_seqno(struct intel_engine_cs *ring)`
	`2752`	`+static struct drm_i915_gem_request *`
	`2753`	`+ring_last_request(struct intel_engine_cs *ring)`
`2754`	`2754`	`{`
`2755`	`2755`	`return list_entry(ring->request_list.prev,`
`2756`		`- struct drm_i915_gem_request, list)->seqno;`
	`2756`	`+ struct drm_i915_gem_request, list);`
`2757`	`2757`	`}`
`2758`	`2758`
`2759`	`2759`	`static bool`
`2760`		`-ring_idle(struct intel_engine_cs *ring, u32 seqno)`
	`2760`	`+ring_idle(struct intel_engine_cs *ring)`
`2761`	`2761`	`{`
`2762`	`2762`	`return (list_empty(&ring->request_list) \|\|`
`2763`		`- i915_seqno_passed(seqno, ring_last_seqno(ring)));`
	`2763`	`+ i915_seqno_passed(ring->get_seqno(ring, false),`
	`2764`	`+ i915_gem_request_get_seqno(ring_last_request(ring))));`
`2764`	`2765`	`}`
`2765`	`2766`
`2766`	`2767`	`static bool`
`@@ -2980,7 +2981,7 @@ static void i915_hangcheck_elapsed(unsigned long data)`
`2980`	`2981`	`acthd = intel_ring_get_active_head(ring);`
`2981`	`2982`
`2982`	`2983`	`if (ring->hangcheck.seqno == seqno) {`
`2983`		`- if (ring_idle(ring, seqno)) {`
	`2984`	`+ if (ring_idle(ring)) {`
`2984`	`2985`	`ring->hangcheck.action = HANGCHECK_IDLE;`
`2985`	`2986`
`2986`	`2987`	`if (waitqueue_active(&ring->irq_queue)) {`