diff options
Diffstat (limited to 'meta-moblin/packages/linux/linux-moblin-2.6.27-rc1/0004_i915.Track_progress_inside_of_batchbuffers_for_determining_wedgedness.patch')
-rw-r--r-- | meta-moblin/packages/linux/linux-moblin-2.6.27-rc1/0004_i915.Track_progress_inside_of_batchbuffers_for_determining_wedgedness.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/meta-moblin/packages/linux/linux-moblin-2.6.27-rc1/0004_i915.Track_progress_inside_of_batchbuffers_for_determining_wedgedness.patch b/meta-moblin/packages/linux/linux-moblin-2.6.27-rc1/0004_i915.Track_progress_inside_of_batchbuffers_for_determining_wedgedness.patch new file mode 100644 index 0000000000..c391d16b76 --- /dev/null +++ b/meta-moblin/packages/linux/linux-moblin-2.6.27-rc1/0004_i915.Track_progress_inside_of_batchbuffers_for_determining_wedgedness.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From: Keith Packard <keithp@keithp.com> | ||
2 | Date: Wed, 30 Jul 2008 19:21:20 +0000 (-0700) | ||
3 | Subject: i915: Track progress inside of batchbuffers for determining wedgedness. | ||
4 | X-Git-Tag: v2.6.12-rc2 | ||
5 | X-Git-Url: http://gitweb.freedesktop.org/?p=users/anholt/anholt/linux-2.6.git;a=commitdiff;h=f0740db2246e4217384e8de32de6ebb4fbd807c9 | ||
6 | |||
7 | i915: Track progress inside of batchbuffers for determining wedgedness. | ||
8 | |||
9 | This avoids early termination for long-running commands. | ||
10 | |||
11 | Signed-off-by: Eric Anholt <eric@anholt.net> | ||
12 | --- | ||
13 | |||
14 | --- a/drivers/gpu/drm/i915/i915_dma.c | ||
15 | +++ b/drivers/gpu/drm/i915/i915_dma.c | ||
16 | @@ -40,11 +40,15 @@ int i915_wait_ring(struct drm_device * d | ||
17 | { | ||
18 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
19 | drm_i915_ring_buffer_t *ring = &(dev_priv->ring); | ||
20 | + u32 acthd_reg = IS_I965G(dev) ? ACTHD_I965 : ACTHD; | ||
21 | + u32 last_acthd = I915_READ(acthd_reg); | ||
22 | + u32 acthd; | ||
23 | u32 last_head = I915_READ(PRB0_HEAD) & HEAD_ADDR; | ||
24 | int i; | ||
25 | |||
26 | - for (i = 0; i < 10000; i++) { | ||
27 | + for (i = 0; i < 100000; i++) { | ||
28 | ring->head = I915_READ(PRB0_HEAD) & HEAD_ADDR; | ||
29 | + acthd = I915_READ(acthd_reg); | ||
30 | ring->space = ring->head - (ring->tail + 8); | ||
31 | if (ring->space < 0) | ||
32 | ring->space += ring->Size; | ||
33 | @@ -55,8 +59,13 @@ int i915_wait_ring(struct drm_device * d | ||
34 | |||
35 | if (ring->head != last_head) | ||
36 | i = 0; | ||
37 | + if (acthd != last_acthd) | ||
38 | + i = 0; | ||
39 | |||
40 | last_head = ring->head; | ||
41 | + last_acthd = acthd; | ||
42 | + msleep_interruptible(10); | ||
43 | + | ||
44 | } | ||
45 | |||
46 | return -EBUSY; | ||
47 | |||