Merge airlied/drm-next into drm-misc-next

[linux-2.6-microblaze.git] / include / drm / drm_syncobj.h

diff --git a/include/drm/drm_syncobj.h b/include/drm/drm_syncobj.h
index 43e2f38..9e8ba90 100644 (file)
--- a/include/drm/drm_syncobj.h
+++ b/include/drm/drm_syncobj.h
@@ -49,7 +49,7 @@ struct drm_syncobj {
         * This field should not be used directly.  Use drm_syncobj_fence_get
         * and drm_syncobj_replace_fence instead.
         */
-       struct dma_fence *fence;
+       struct dma_fence __rcu *fence;
        /**
         * @cb_list:
         * List of callbacks to call when the fence gets replaced