Attachment 57317 Details for Bug 45181 – patches from for-nkalkhof branch

[patch] patches from for-nkalkhof branch

old-voodoo-fix.patch (text/plain), 6.95 KB, created by Daniel Vetter on 2012-02-20 05:07:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2012-02-20 05:07:34 UTC

Size: 6.95 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>index 32737a3..2f102ad 100644
>--- a/drivers/gpu/drm/i915/i915_drv.h
>+++ b/drivers/gpu/drm/i915/i915_drv.h
>@@ -1159,12 +1159,7 @@ i915_seqno_passed(uint32_t seq1, uint32_t seq2)
> 	return (int32_t)(seq1 - seq2) >= 0;
> }
> 
>-static inline u32
>-i915_gem_next_request_seqno(struct intel_ring_buffer *ring)
>-{
>-	drm_i915_private_t *dev_priv = ring->dev->dev_private;
>-	return ring->outstanding_lazy_request = dev_priv->next_seqno;
>-}
>+u32 i915_gem_next_request_seqno(struct intel_ring_buffer *ring);
> 
> int __must_check i915_gem_object_get_fence(struct drm_i915_gem_object *obj,
> 					   struct intel_ring_buffer *pipelined);
>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index eb98a7f..a72100c 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -1647,6 +1647,28 @@ i915_gem_process_flushing_list(struct intel_ring_buffer *ring,
> 	}
> }
> 
>+static u32
>+i915_gem_get_seqno(struct drm_device *dev)
>+{
>+	drm_i915_private_t *dev_priv = dev->dev_private;
>+	u32 seqno = dev_priv->next_seqno;
>+
>+	/* reserve 0 for non-seqno */
>+	if (++dev_priv->next_seqno == 0)
>+		dev_priv->next_seqno = 1;
>+
>+	return seqno;
>+}
>+
>+u32
>+i915_gem_next_request_seqno(struct intel_ring_buffer *ring)
>+{
>+	if (ring->outstanding_lazy_request == 0)
>+		ring->outstanding_lazy_request = i915_gem_get_seqno(ring->dev);
>+
>+	return ring->outstanding_lazy_request;
>+}
>+
> int
> i915_add_request(struct intel_ring_buffer *ring,
> 		 struct drm_file *file,
>@@ -1658,8 +1680,9 @@ i915_add_request(struct intel_ring_buffer *ring,
> 	int ret;
> 
> 	BUG_ON(request == NULL);
>+	seqno = i915_gem_next_request_seqno(ring);
> 
>-	ret = ring->add_request(ring, &seqno);
>+	ret = ring->add_request(ring, seqno);
> 	if (ret)
> 	    return ret;
> 
>@@ -1681,7 +1704,7 @@ i915_add_request(struct intel_ring_buffer *ring,
> 		spin_unlock(&file_priv->mm.lock);
> 	}
> 
>-	ring->outstanding_lazy_request = false;
>+	ring->outstanding_lazy_request = 0;
> 
> 	if (!dev_priv->mm.suspended) {
> 		if (i915_enable_hangcheck) {
>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index 5bd4361..b1c902f 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -1752,18 +1752,6 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
> 
> 	I915_WRITE(HWSTAM, 0xeffe);
> 
>-	if (IS_GEN6(dev)) {
>-		/* Workaround stalls observed on Sandy Bridge GPUs by
>-		 * making the blitter command streamer generate a
>-		 * write to the Hardware Status Page for
>-		 * MI_USER_INTERRUPT.  This appears to serialize the
>-		 * previous seqno write out before the interrupt
>-		 * happens.
>-		 */
>-		I915_WRITE(GEN6_BLITTER_HWSTAM, ~GEN6_BLITTER_USER_INTERRUPT);
>-		I915_WRITE(GEN6_BSD_HWSTAM, ~GEN6_BSD_USER_INTERRUPT);
>-	}
>-
> 	/* XXX hotplug from PCH */
> 
> 	I915_WRITE(DEIMR, 0xffffffff);
>diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
>index 1ab842c..1fc8232 100644
>--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
>+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
>@@ -52,20 +52,6 @@ static inline int ring_space(struct intel_ring_buffer *ring)
> 	return space;
> }
> 
>-static u32 i915_gem_get_seqno(struct drm_device *dev)
>-{
>-	drm_i915_private_t *dev_priv = dev->dev_private;
>-	u32 seqno;
>-
>-	seqno = dev_priv->next_seqno;
>-
>-	/* reserve 0 for non-seqno */
>-	if (++dev_priv->next_seqno == 0)
>-		dev_priv->next_seqno = 1;
>-
>-	return seqno;
>-}
>-
> static int
> render_ring_flush(struct intel_ring_buffer *ring,
> 		  u32	invalidate_domains,
>@@ -454,7 +440,7 @@ update_mboxes(struct intel_ring_buffer *ring,
>  */
> static int
> gen6_add_request(struct intel_ring_buffer *ring,
>-		 u32 *seqno)
>+		 u32 seqno)
> {
> 	u32 mbox1_reg;
> 	u32 mbox2_reg;
>@@ -467,13 +453,11 @@ gen6_add_request(struct intel_ring_buffer *ring,
> 	mbox1_reg = ring->signal_mbox[0];
> 	mbox2_reg = ring->signal_mbox[1];
> 
>-	*seqno = i915_gem_get_seqno(ring->dev);
>-
>-	update_mboxes(ring, *seqno, mbox1_reg);
>-	update_mboxes(ring, *seqno, mbox2_reg);
>+	update_mboxes(ring, seqno, mbox1_reg);
>+	update_mboxes(ring, seqno, mbox2_reg);
> 	intel_ring_emit(ring, MI_STORE_DWORD_INDEX);
> 	intel_ring_emit(ring, I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT);
>-	intel_ring_emit(ring, *seqno);
>+	intel_ring_emit(ring, seqno);
> 	intel_ring_emit(ring, MI_USER_INTERRUPT);
> 	intel_ring_advance(ring);
> 
>@@ -563,10 +547,8 @@ do {									\
> 
> static int
> pc_render_add_request(struct intel_ring_buffer *ring,
>-		      u32 *result)
>+		      u32 seqno)
> {
>-	struct drm_device *dev = ring->dev;
>-	u32 seqno = i915_gem_get_seqno(dev);
> 	struct pipe_control *pc = ring->private;
> 	u32 scratch_addr = pc->gtt_offset + 128;
> 	int ret;
>@@ -609,16 +591,13 @@ pc_render_add_request(struct intel_ring_buffer *ring,
> 	intel_ring_emit(ring, 0);
> 	intel_ring_advance(ring);
> 
>-	*result = seqno;
> 	return 0;
> }
> 
> static int
> render_ring_add_request(struct intel_ring_buffer *ring,
>-			u32 *result)
>+			u32 seqno)
> {
>-	struct drm_device *dev = ring->dev;
>-	u32 seqno = i915_gem_get_seqno(dev);
> 	int ret;
> 
> 	ret = intel_ring_begin(ring, 4);
>@@ -631,7 +610,6 @@ render_ring_add_request(struct intel_ring_buffer *ring,
> 	intel_ring_emit(ring, MI_USER_INTERRUPT);
> 	intel_ring_advance(ring);
> 
>-	*result = seqno;
> 	return 0;
> }
> 
>@@ -783,24 +761,20 @@ bsd_ring_flush(struct intel_ring_buffer *ring,
> 
> static int
> ring_add_request(struct intel_ring_buffer *ring,
>-		 u32 *result)
>+		 u32 seqno)
> {
>-	u32 seqno;
> 	int ret;
> 
> 	ret = intel_ring_begin(ring, 4);
> 	if (ret)
> 		return ret;
> 
>-	seqno = i915_gem_get_seqno(ring->dev);
>-
> 	intel_ring_emit(ring, MI_STORE_DWORD_INDEX);
> 	intel_ring_emit(ring, I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT);
> 	intel_ring_emit(ring, seqno);
> 	intel_ring_emit(ring, MI_USER_INTERRUPT);
> 	intel_ring_advance(ring);
> 
>-	*result = seqno;
> 	return 0;
> }
> 
>@@ -816,8 +790,7 @@ gen6_ring_get_irq(struct intel_ring_buffer *ring, u32 gflag, u32 rflag)
> 	/* It looks like we need to prevent the gt from suspending while waiting
> 	 * for an notifiy irq, otherwise irqs seem to get lost on at least the
> 	 * blt/bsd rings on ivb. */
>-	if (IS_GEN7(dev))
>-		gen6_gt_force_wake_get(dev_priv);
>+	gen6_gt_force_wake_get(dev_priv);
> 
> 	spin_lock(&ring->irq_lock);
> 	if (ring->irq_refcount++ == 0) {
>@@ -844,8 +817,7 @@ gen6_ring_put_irq(struct intel_ring_buffer *ring, u32 gflag, u32 rflag)
> 	}
> 	spin_unlock(&ring->irq_lock);
> 
>-	if (IS_GEN7(dev))
>-		gen6_gt_force_wake_put(dev_priv);
>+	gen6_gt_force_wake_put(dev_priv);
> }
> 
> static bool
>diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
>index 68281c9..1638f32 100644
>--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
>+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
>@@ -70,7 +70,7 @@ struct  intel_ring_buffer {
> 				  u32	invalidate_domains,
> 				  u32	flush_domains);
> 	int		(*add_request)(struct intel_ring_buffer *ring,
>-				       u32 *seqno);
>+				       u32 seqno);
> 	u32		(*get_seqno)(struct intel_ring_buffer *ring);
> 	int		(*dispatch_execbuffer)(struct intel_ring_buffer *ring,
> 					       u32 offset, u32 length);

Actions: View | Splinter Review

Attachments on bug 45181: 56088 | 56108 | 57315 | 57317

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.