diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-04-12 03:54:11 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-04-12 03:54:11 +0000 |
| commit | c06a0d787f643fdc9e54876825af4e3c4e9fd5d6 (patch) | |
| tree | a304536faea0c62d42c3119f7414d6a656d2d988 /sys/dev/pci/drm/i915 | |
| parent | 4af5657611fd1becc4c0fef7d583167b2ab1d6e6 (diff) | |
make wait_queue_head a struct with a mutex
better matches linux behaviour
Diffstat (limited to 'sys/dev/pci/drm/i915')
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_gem.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915/intel_ringbuffer.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915/intel_ringbuffer.h | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/sys/dev/pci/drm/i915/i915_gem.c b/sys/dev/pci/drm/i915/i915_gem.c index 0dc5341ee7c..9e477732953 100644 --- a/sys/dev/pci/drm/i915/i915_gem.c +++ b/sys/dev/pci/drm/i915/i915_gem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i915_gem.c,v 1.89 2015/04/08 02:28:13 jsg Exp $ */ +/* $OpenBSD: i915_gem.c,v 1.90 2015/04/12 03:54:10 jsg Exp $ */ /* * Copyright (c) 2008-2009 Owain G. Ainsworth <oga@openbsd.org> * @@ -4304,9 +4304,7 @@ i915_gem_load(struct drm_device *dev) i915_gem_reset_fences(dev); i915_gem_detect_bit_6_swizzle(dev); -#if 0 init_waitqueue_head(&dev_priv->pending_flip_queue); -#endif dev_priv->mm.interruptible = true; diff --git a/sys/dev/pci/drm/i915/intel_ringbuffer.c b/sys/dev/pci/drm/i915/intel_ringbuffer.c index eb670651c33..e42e8b81934 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.25 2015/02/12 04:56:03 kettenis Exp $ */ +/* $OpenBSD: intel_ringbuffer.c,v 1.26 2015/04/12 03:54:10 jsg Exp $ */ /* * Copyright © 2008-2010 Intel Corporation * @@ -1202,7 +1202,7 @@ static int intel_init_ring_buffer(struct drm_device *dev, ring->size = 32 * PAGE_SIZE; memset(ring->sync_seqno, 0, sizeof(ring->sync_seqno)); -// init_waitqueue_head(&ring->irq_queue); + init_waitqueue_head(&ring->irq_queue); if (I915_NEED_GFX_HWS(dev)) { ret = init_status_page(ring); diff --git a/sys/dev/pci/drm/i915/intel_ringbuffer.h b/sys/dev/pci/drm/i915/intel_ringbuffer.h index 22459af08e1..3512e4935c7 100644 --- a/sys/dev/pci/drm/i915/intel_ringbuffer.h +++ b/sys/dev/pci/drm/i915/intel_ringbuffer.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intel_ringbuffer.h,v 1.4 2015/04/03 13:10:59 jsg Exp $ */ +/* $OpenBSD: intel_ringbuffer.h,v 1.5 2015/04/12 03:54:10 jsg Exp $ */ #ifndef _INTEL_RINGBUFFER_H_ #define _INTEL_RINGBUFFER_H_ @@ -131,7 +131,7 @@ struct intel_ring_buffer { u32 outstanding_lazy_request; bool gpu_caches_dirty; - int irq_queue; + wait_queue_head_t irq_queue; /** * Do an explicit TLB flush before MI_SET_CONTEXT |