diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-05-09 00:19:38 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-05-09 00:19:38 (GMT) |
| commit | 2c3d68abe2f06b21f047b52e6f0e1b82542e1332 (patch) | |
| tree | 6096496b85ea22c45abb6fd584343e79c75083ca /include | |
| parent | 2958cf0ee2232cddf06cc9efaf143a0919b266f5 (diff) | |
| parent | 2b669875332fbdff0a7ad559e8662e875e7a1526 (diff) | |
| download | linux-2c3d68abe2f06b21f047b52e6f0e1b82542e1332.tar.xz | |
Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next
Mostly cleanups, fixes, and 'struct fence' conversion this time
around, with one reservation patch which is a-b Sumit (which the fence
conversion patches depend on).
* 'msm-next' of git://people.freedesktop.org/~robclark/linux: (25 commits)
drm/msm: Drop load/unload drm_driver ops
drm/msm: Centralize connector registration/unregistration
drm/msm/hdmi: Prevent gpio_free related kernel warnings
drm/msm: print offender task name on hangcheck recovery
drm/msm: fix leak in failed submit path
drm/msm: de-indent submit_create()
drm/msm: drop return from gpu->submit()
drm/msm/mdp4: Don't manage DSI PLL regulators in MDP driver
drm/msm/edp: Drop regulator_set_voltage call
drm/msm/dsi: Fix regulator API abuse
drm/msm: Move call to PTR_ERR_OR_ZERO after reassignment
drm/msm/mdp: Add support for more RGBX formats
drm: msm: remove unused variable
drm/msm: fix ->last_fence() after recover
drm/msm: 'struct fence' conversion
drm/msm: remove fence_cbs
drm/msm: introduce msm_fence_context
drm/msm: split locking and pinning BO's
drm/msm/gpu: simplify tracking in-flight bo's
drm/msm: split out timeout_to_jiffies helper
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/reservation.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/include/linux/reservation.h b/include/linux/reservation.h index 5a0b64c..49d0576 100644 --- a/include/linux/reservation.h +++ b/include/linux/reservation.h @@ -120,6 +120,24 @@ reservation_object_get_excl(struct reservation_object *obj) reservation_object_held(obj)); } +static inline struct fence * +reservation_object_get_excl_rcu(struct reservation_object *obj) +{ + struct fence *fence; + unsigned seq; +retry: + seq = read_seqcount_begin(&obj->seq); + rcu_read_lock(); + fence = rcu_dereference(obj->fence_excl); + if (read_seqcount_retry(&obj->seq, seq)) { + rcu_read_unlock(); + goto retry; + } + fence = fence_get(fence); + rcu_read_unlock(); + return fence; +} + int reservation_object_reserve_shared(struct reservation_object *obj); void reservation_object_add_shared_fence(struct reservation_object *obj, struct fence *fence); |