diff options
| author |   kettenis <kettenis@openbsd.org> | 2013-11-20 22:10:19 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2013-11-20 22:10:19 +0000 |
| commit | d9210db0541e3393c636bfce49d378e54de6eb11 (patch) | |
| tree | 48ec2b231fe3ee6b2864f83c8fccbfe29bf0a02a | |
| parent | Silly Linux-style negative errno returns. (diff) | |
| download | wireguard-openbsd-d9210db0541e3393c636bfce49d378e54de6eb11.tar.xz wireguard-openbsd-d9210db0541e3393c636bfce49d378e54de6eb11.zip | |
Eliminate some differences with the Linux code; no code change.
| -rw-r--r-- | sys/dev/pci/drm/i915/intel_ringbuffer.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/pci/drm/i915/intel_ringbuffer.c b/sys/dev/pci/drm/i915/intel_ringbuffer.c index 280932df619..c8d9736503c 100644 --- a/sys/dev/pci/drm/i915/intel_ringbuffer.c +++ b/sys/dev/pci/drm/i915/intel_ringbuffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intel_ringbuffer.c,v 1.8 2013/11/19 19:14:09 kettenis Exp $ */ +/* $OpenBSD: intel_ringbuffer.c,v 1.9 2013/11/20 22:10:19 kettenis Exp $ */ /* * Copyright © 2008-2010 Intel Corporation * @@ -1422,19 +1422,20 @@ int intel_ring_idle(struct intel_ring_buffer *ring) u32 seqno; int ret; + /* We need to add any requests required to flush the objects and ring */ if (ring->outstanding_lazy_request) { ret = i915_add_request(ring, NULL, NULL); if (ret) return ret; } + /* Wait upon the last request to be completed */ if (list_empty(&ring->request_list)) return 0; seqno = list_entry(ring->request_list.prev, struct drm_i915_gem_request, list)->seqno; - return i915_wait_seqno(ring, seqno); } @@ -1490,6 +1491,7 @@ void intel_ring_advance(struct intel_ring_buffer *ring) ring->write_tail(ring, ring->tail); } + static void gen6_bsd_ring_write_tail(struct intel_ring_buffer *ring, u32 value) { @@ -1600,7 +1602,8 @@ gen6_ring_dispatch_execbuffer(struct intel_ring_buffer *ring, /* Blitter support (SandyBridge+) */ -static int blt_ring_flush(struct intel_ring_buffer *ring, u32 invalidate, u32 flush) +static int blt_ring_flush(struct intel_ring_buffer *ring, + u32 invalidate, u32 flush) { uint32_t cmd; int ret; |