diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-04-04 05:45:27 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-04-04 05:45:27 +1000 |
| commit | 84c4ba54f4a52f4d045c956dbc9801f27eb300b7 (patch) | |
| tree | e80de38a542fcdf70a876f882454bdd24b7e74fa /include | |
| parent | a71c9a1c779f2499fb2afc0553e543f18aff6edf (diff) | |
| parent | e7e11f99564222d82f0ce84bd521e57d78a6b678 (diff) | |
| download | linux-84c4ba54f4a52f4d045c956dbc9801f27eb300b7.tar.gz linux-84c4ba54f4a52f4d045c956dbc9801f27eb300b7.tar.bz2 linux-84c4ba54f4a52f4d045c956dbc9801f27eb300b7.zip | |
Merge branch 'vmwgfx-fixes-4.11' of git://people.freedesktop.org/~thomash/linux into drm-fixes
Set of vmwgfx fixes
* 'vmwgfx-fixes-4.11' of git://people.freedesktop.org/~thomash/linux:
drm/vmwgfx: fix integer overflow in vmw_surface_define_ioctl()
drm/vmwgfx: Remove getparam error message
drm/ttm: Avoid calling drm_ht_remove from atomic context
drm/ttm, drm/vmwgfx: Relax permission checking when opening surfaces
drm/vmwgfx: avoid calling vzalloc with a 0 size in vmw_get_cap_3d_ioctl()
drm/vmwgfx: NULL pointer dereference in vmw_surface_define_ioctl()
drm/vmwgfx: Type-check lookups of fence objects
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/ttm/ttm_object.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/drm/ttm/ttm_object.h b/include/drm/ttm/ttm_object.h index ed953f98f0e1..1487011fe057 100644 --- a/include/drm/ttm/ttm_object.h +++ b/include/drm/ttm/ttm_object.h @@ -229,6 +229,8 @@ extern void ttm_base_object_unref(struct ttm_base_object **p_base); * @ref_type: The type of reference. * @existed: Upon completion, indicates that an identical reference object * already existed, and the refcount was upped on that object instead. + * @require_existed: Fail with -EPERM if an identical ref object didn't + * already exist. * * Checks that the base object is shareable and adds a ref object to it. * @@ -243,7 +245,8 @@ extern void ttm_base_object_unref(struct ttm_base_object **p_base); */ extern int ttm_ref_object_add(struct ttm_object_file *tfile, struct ttm_base_object *base, - enum ttm_ref_type ref_type, bool *existed); + enum ttm_ref_type ref_type, bool *existed, + bool require_existed); extern bool ttm_ref_object_exists(struct ttm_object_file *tfile, struct ttm_base_object *base); |