Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 218335
b: refs/heads/master
c: e36c1cd
h: refs/heads/master
i:
  218333: 2814ffb
  218331: 8c69963
  218327: 04bc8f5
  218319: f00df49
  218303: 1a8a2be
v: v3
  • Loading branch information
Chris Wilson committed Oct 21, 2010
1 parent 65e1e55 commit b9eb63c
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 20 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c717966744e618af76aa5d7fe6cc44dba487bdc6
refs/heads/master: e36c1cd7292efcb8daca26cd6331481736544742
15 changes: 0 additions & 15 deletions trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -733,21 +733,6 @@ void intel_ring_advance(struct drm_device *dev,
ring->set_tail(dev, ring, ring->tail);
}

void intel_fill_struct(struct drm_device *dev,
struct intel_ring_buffer *ring,
void *data,
unsigned int len)
{
unsigned int *virt = ring->virtual_start + ring->tail;
BUG_ON((len&~(4-1)) != 0);
intel_ring_begin(dev, ring, len/4);
memcpy(virt, data, len);
ring->tail += len;
ring->tail &= ring->size - 1;
ring->space -= len;
intel_ring_advance(dev, ring);
}

static const struct intel_ring_buffer render_ring = {
.name = "render ring",
.id = RING_RENDER,
Expand Down
4 changes: 0 additions & 4 deletions trunk/drivers/gpu/drm/i915/intel_ringbuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,6 @@ static inline void intel_ring_emit(struct drm_device *dev,
ring->tail += 4;
}

void intel_fill_struct(struct drm_device *dev,
struct intel_ring_buffer *ring,
void *data,
unsigned int len);
void intel_ring_advance(struct drm_device *dev,
struct intel_ring_buffer *ring);

Expand Down

0 comments on commit b9eb63c

Please sign in to comment.