fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2026-05-07 08:48:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

i915: Don't always read/write LP_RING register in generalized ring functions.

Browse source
This commit is contained in:
Michel Dänzer 2007-04-18 19:35:58 +02:00
parent 5f3c5781df
commit ad172d79d1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
shared-core/i915_dma.c
View file

@ -45,11 +45,11 @@
int i915_wait_ring(drm_i915_private_t *dev_priv, drm_i915_ring_buffer_t *ring,
int n, const char *caller)
{
u32 last_head = I915_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
u32 last_head = I915_READ(ring->reg + RING_HEAD) & HEAD_ADDR;
int i;
for (i = 0; i < 10000; i++) {
ring->head = I915_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
ring->head = I915_READ(ring->reg + RING_HEAD) & HEAD_ADDR;
ring->space = ring->head - (ring->tail + 8);
if (ring->space < 0)
ring->space += ring->Size;
@ -71,8 +71,8 @@ int i915_wait_ring(drm_i915_private_t *dev_priv, drm_i915_ring_buffer_t *ring,
void i915_kernel_lost_context(drm_i915_private_t * dev_priv,
drm_i915_ring_buffer_t *ring)
{
ring->head = I915_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
ring->tail = I915_READ(LP_RING + RING_TAIL) & TAIL_ADDR;
ring->head = I915_READ(ring->reg + RING_HEAD) & HEAD_ADDR;
ring->tail = I915_READ(ring->reg + RING_TAIL) & TAIL_ADDR;
ring->space = ring->head - (ring->tail + 8);
if (ring->space < 0)
ring->space += ring->Size;