diff options
| author |   Dave Airlie <airlied@redhat.com> | 2014-04-05 16:07:39 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-04-05 16:07:39 +1000 |
| commit | 8d51a977a4961d3ed6df699aea50bc2dd6bbc5cc (patch) | |
| tree | cff4fe3ab8eee3d8efab35aa5dad0d7c33bde527 /drivers/gpu/drm/qxl/qxl_release.c | |
| parent | drm/dp_helper: don't return EPROTO for defers (v2) (diff) | |
| parent | drm/ttm: Hide the implementation details of reservation (diff) | |
| download | wireguard-linux-8d51a977a4961d3ed6df699aea50bc2dd6bbc5cc.tar.xz wireguard-linux-8d51a977a4961d3ed6df699aea50bc2dd6bbc5cc.zip | |
Merge tag 'ttm-next-2014-04-04' of git://people.freedesktop.org/~thomash/linux into drm-next
Pull request of 2014-04-04
Currently only a single patch fixing up mixed use of the ttm_bo_reserve and
ww_mutex APIs
* tag 'ttm-next-2014-04-04' of git://people.freedesktop.org/~thomash/linux:
drm/ttm: Hide the implementation details of reservation
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_release.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c index 821ab7b9409b..14e776f1d14e 100644 --- a/drivers/gpu/drm/qxl/qxl_release.c +++ b/drivers/gpu/drm/qxl/qxl_release.c @@ -349,7 +349,7 @@ void qxl_release_fence_buffer_objects(struct qxl_release *release) qxl_fence_add_release_locked(&qbo->fence, release->id); ttm_bo_add_to_lru(bo); - ww_mutex_unlock(&bo->resv->lock); + __ttm_bo_unreserve(bo); entry->reserved = false; } spin_unlock(&bdev->fence_lock); |