Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 563eaf53 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/syncobj: Use proper methods for accessing rcu protected pointers 



Use rcu_dereference_protected() and rcu_assign_pointer() for accessing
the rcu protected syncobj->fence pointer. This eliminates several sparse
warnings.

Cc: Dave Airlie <airlied@redhat.com>
Cc: Jason Ekstrand <jason@jlekstrand.net>
Cc: linaro-mm-sig@lists.linaro.org
Cc: linux-media@vger.kernel.org
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171102200336.23347-4-ville.syrjala@linux.intel.com


Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
parent 5f72db59

drivers/gpu/drm/drm_syncobj.c

+7 −4
Original line number Diff line number Diff line
@@ -106,7 +106,8 @@ static int drm_syncobj_fence_get_or_add_callback(struct drm_syncobj *syncobj, 
	 * callback when a fence has already been set.

	 */

	if (syncobj->fence) {

		*fence = dma_fence_get(syncobj->fence);

		*fence = dma_fence_get(rcu_dereference_protected(syncobj->fence,

								 lockdep_is_held(&syncobj->lock)));

		ret = 1;

	} else {

		*fence = NULL;
@@ -168,8 +169,9 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, 


	spin_lock(&syncobj->lock);



	old_fence = syncobj->fence;

	syncobj->fence = fence;

	old_fence = rcu_dereference_protected(syncobj->fence,

					      lockdep_is_held(&syncobj->lock));

	rcu_assign_pointer(syncobj->fence, fence);



	if (fence != old_fence) {

		list_for_each_entry_safe(cur, tmp, &syncobj->cb_list, node) {
@@ -613,7 +615,8 @@ static void syncobj_wait_syncobj_func(struct drm_syncobj *syncobj, 
		container_of(cb, struct syncobj_wait_entry, syncobj_cb);



	/* This happens inside the syncobj lock */

	wait->fence = dma_fence_get(syncobj->fence);

	wait->fence = dma_fence_get(rcu_dereference_protected(syncobj->fence,

							      lockdep_is_held(&syncobj->lock)));

	wake_up_process(wait->task);

}