summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@openbsd.org>2013-02-24 19:52:44 +0100
committerMark Kettenis <kettenis@openbsd.org>2013-02-24 19:52:44 +0100
commit06fca749566b2b12a33a7501ee7aa5ea0fb5f412 (patch)
tree92aa62d957a2ab9d53881b032d6fa720a43d0c7f /sys
parent8a773363d0f87c9002e80d99f2c06b0e52950704 (diff)
Bring i915_gem_object_move_to_active() a bit more in line with Linux.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/drm/i915_gem.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/i915_gem.c b/sys/dev/pci/drm/i915_gem.c
index 115d778bc77..d801c1b73e6 100644
--- a/sys/dev/pci/drm/i915_gem.c
+++ b/sys/dev/pci/drm/i915_gem.c
@@ -812,11 +812,12 @@ i915_gem_object_move_to_active(struct drm_i915_gem_object *obj,
seqno = i915_gem_next_request_seqno(ring);
+ BUG_ON(ring == NULL);
obj->ring = ring;
/* Add a reference if we're newly entering the active list. */
if (!obj->active) {
- drm_ref(&obj->base.uobj);
+ drm_gem_object_reference(&obj->base);
obj->active = 1;
}