diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-11-21 18:46:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-11-21 18:46:26 +1000 |
| commit | 28adb3026d01da3f6acded3cec817e1a3ba37f44 (patch) | |
| tree | 26df1bf50f9ccf6fd282f3b22d103cb3b30ecaa3 /include/drm/ttm/ttm_execbuf_util.h | |
| parent | cf969677945e6e19810d616873617320da002e32 (diff) | |
| parent | c486d4f894d7c7d0e4148426360aa354384f6dc8 (diff) | |
Merge branch 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into drm-fixes
Below is a fix for a false lockep warning,
and the vmwgfx prime implementation.
* 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux:
drm/vmwgfx: Make vmwgfx dma buffers prime aware
drm/vmwgfx: Make surfaces prime-aware
drm/vmwgfx: Hook up the prime ioctls
drm/ttm: Add a minimal prime implementation for ttm base objects
drm/vmwgfx: Fix false lockdep warning
drm/ttm: Allow execbuf util reserves without ticket
Diffstat (limited to 'include/drm/ttm/ttm_execbuf_util.h')
| -rw-r--r-- | include/drm/ttm/ttm_execbuf_util.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/drm/ttm/ttm_execbuf_util.h b/include/drm/ttm/ttm_execbuf_util.h index ec8a1d30651..16db7d01a33 100644 --- a/include/drm/ttm/ttm_execbuf_util.h +++ b/include/drm/ttm/ttm_execbuf_util.h @@ -70,7 +70,8 @@ extern void ttm_eu_backoff_reservation(struct ww_acquire_ctx *ticket, /** * function ttm_eu_reserve_buffers * - * @ticket: [out] ww_acquire_ctx returned by call. + * @ticket: [out] ww_acquire_ctx filled in by call, or NULL if only + * non-blocking reserves should be tried. * @list: thread private list of ttm_validate_buffer structs. * * Tries to reserve bos pointed to by the list entries for validation. |