summaryrefslogtreecommitdiff
path: root/sys/dev/pci/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2016-04-05 21:22:03 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2016-04-05 21:22:03 +0000
commitf5f92c19a5ed8a465fc27f2f30edc4410374597f (patch)
tree35638344d41a6682618e71cda27d3f9659bb5bcb /sys/dev/pci/drm/i915/i915_drv.h
parent3d9fed1b7991ee8422f9d41fba720c8d2706791a (diff)
Use the "idr" API here as well, reducing the diffs to Linux.
Diffstat (limited to 'sys/dev/pci/drm/i915/i915_drv.h')
-rw-r--r--sys/dev/pci/drm/i915/i915_drv.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/dev/pci/drm/i915/i915_drv.h b/sys/dev/pci/drm/i915/i915_drv.h
index 420b1f0375d..ba10a76d4fa 100644
--- a/sys/dev/pci/drm/i915/i915_drv.h
+++ b/sys/dev/pci/drm/i915/i915_drv.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: i915_drv.h,v 1.73 2015/12/09 05:17:44 jsg Exp $ */
+/* $OpenBSD: i915_drv.h,v 1.74 2016/04/05 21:22:02 kettenis Exp $ */
/* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
*/
/*
@@ -786,12 +786,6 @@ struct i915_hw_context {
struct list_head link;
};
-struct i915_ctx_handle {
- SPLAY_ENTRY(i915_ctx_handle) entry;
- struct i915_hw_context *ctx;
- uint32_t handle;
-};
-
struct i915_fbc {
unsigned long size;
unsigned int fb_id;
@@ -1906,8 +1900,7 @@ struct drm_i915_file_private {
struct list_head request_list;
struct delayed_work idle_work;
} mm;
- SPLAY_HEAD(i915_ctx_tree, i915_ctx_handle) ctx_tree;
- uint32_t ctx_id;
+ struct idr context_idr;
struct i915_ctx_hang_stats hang_stats;
atomic_t rps_wait_boost;