diff options
| author | Mark Kettenis <kettenis@openbsd.org> | 2013-02-24 21:04:09 +0100 |
|---|---|---|
| committer | Mark Kettenis <kettenis@openbsd.org> | 2013-02-24 21:04:09 +0100 |
| commit | b3bef48d4f20bf49f467c1d4d7fa3dda189f0121 (patch) | |
| tree | 7a935781128cdcc39eb0018e52eb24b1e6aae029 /sys/dev/pci/drm/i915_gem.c | |
| parent | 06fca749566b2b12a33a7501ee7aa5ea0fb5f412 (diff) | |
Change I915_GPU_WRITE into a bitfield and adjust related code to be similar
to what Linux does.
Diffstat (limited to 'sys/dev/pci/drm/i915_gem.c')
| -rw-r--r-- | sys/dev/pci/drm/i915_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/i915_gem.c b/sys/dev/pci/drm/i915_gem.c index d801c1b73e6..8431aae4869 100644 --- a/sys/dev/pci/drm/i915_gem.c +++ b/sys/dev/pci/drm/i915_gem.c @@ -877,10 +877,10 @@ i915_gem_object_move_to_inactive_locked(struct drm_i915_gem_object *obj) i915_gem_object_move_off_active(obj); obj->fenced_gpu_access = false; - KASSERT((obj->base.do_flags & I915_GPU_WRITE) == 0); /* unlock because this unref could recurse */ if (obj->active) { obj->active = 0; + obj->pending_gpu_write = false; drm_unref_locked(&obj->base.uobj); } else { drm_unlock_obj(&obj->base); |