drm: Convert syncobj_idr to XArray

Signed-off-by: Matthew Wilcox <willy@infradead.org>

diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
index a199c8d56b95056e9282a5c678e2a53aeedb7a34..325bcc5af48ebb95fcf33158f13f0afcf2bd2619 100644 (file)
--- a/drivers/gpu/drm/drm_syncobj.c
+++ b/drivers/gpu/drm/drm_syncobj.c
@@ -85,14 +85,12 @@ struct drm_syncobj *drm_syncobj_find(struct drm_file *file_private,
 {
        struct drm_syncobj *syncobj;
 
-       spin_lock(&file_private->syncobj_table_lock);
-
-       /* Check if we currently have a reference on the object */
-       syncobj = idr_find(&file_private->syncobj_idr, handle);
+       /* Get a reference on the object */
+       xa_lock(&file_private->syncobjs);
+       syncobj = xa_load(&file_private->syncobjs, handle);
        if (syncobj)
                drm_syncobj_get(syncobj);
-
-       spin_unlock(&file_private->syncobj_table_lock);
+       xa_unlock(&file_private->syncobjs);
 
        return syncobj;
 }
@@ -365,23 +363,16 @@ int drm_syncobj_get_handle(struct drm_file *file_private,
 {
        int ret;
 
-       /* take a reference to put in the idr */
+       /* take a reference to put in the XArray */
        drm_syncobj_get(syncobj);
 
-       idr_preload(GFP_KERNEL);
-       spin_lock(&file_private->syncobj_table_lock);
-       ret = idr_alloc(&file_private->syncobj_idr, syncobj, 1, 0, GFP_NOWAIT);
-       spin_unlock(&file_private->syncobj_table_lock);
+       ret = xa_alloc(&file_private->syncobjs, handle, syncobj, xa_limit_31b,
+                       GFP_KERNEL);
 
-       idr_preload_end();
-
-       if (ret < 0) {
+       if (ret < 0)
                drm_syncobj_put(syncobj);
-               return ret;
-       }
 
-       *handle = ret;
-       return 0;
+       return ret;
 }
 EXPORT_SYMBOL(drm_syncobj_get_handle);
 
@@ -405,9 +396,7 @@ static int drm_syncobj_destroy(struct drm_file *file_private,
 {
        struct drm_syncobj *syncobj;
 
-       spin_lock(&file_private->syncobj_table_lock);
-       syncobj = idr_remove(&file_private->syncobj_idr, handle);
-       spin_unlock(&file_private->syncobj_table_lock);
+       syncobj = xa_erase(&file_private->syncobjs, handle);
 
        if (!syncobj)
                return -EINVAL;
@@ -495,16 +484,10 @@ static int drm_syncobj_fd_to_handle(struct drm_file *file_private,
        syncobj = f.file->private_data;
        drm_syncobj_get(syncobj);
 
-       idr_preload(GFP_KERNEL);
-       spin_lock(&file_private->syncobj_table_lock);
-       ret = idr_alloc(&file_private->syncobj_idr, syncobj, 1, 0, GFP_NOWAIT);
-       spin_unlock(&file_private->syncobj_table_lock);
-       idr_preload_end();
+       ret = xa_alloc(&file_private->syncobjs, handle, syncobj, xa_limit_31b,
+                       GFP_KERNEL);
 
-       if (ret > 0) {
-               *handle = ret;
-               ret = 0;
-       } else
+       if (ret < 0)
                drm_syncobj_put(syncobj);
 
        fdput(f);
@@ -574,17 +557,7 @@ err_put_fd:
 void
 drm_syncobj_open(struct drm_file *file_private)
 {
-       idr_init_base(&file_private->syncobj_idr, 1);
-       spin_lock_init(&file_private->syncobj_table_lock);
-}
-
-static int
-drm_syncobj_release_handle(int id, void *ptr, void *data)
-{
-       struct drm_syncobj *syncobj = ptr;
-
-       drm_syncobj_put(syncobj);
-       return 0;
+       xa_init_flags(&file_private->syncobjs, XA_FLAGS_ALLOC1);
 }
 
 /**
@@ -598,9 +571,12 @@ drm_syncobj_release_handle(int id, void *ptr, void *data)
 void
 drm_syncobj_release(struct drm_file *file_private)
 {
-       idr_for_each(&file_private->syncobj_idr,
-                    &drm_syncobj_release_handle, file_private);
-       idr_destroy(&file_private->syncobj_idr);
+       struct drm_syncobj *syncobj;
+       unsigned long index;
+
+       xa_for_each(&file_private->syncobjs, index, syncobj)
+               drm_syncobj_put(syncobj);
+       xa_destroy(&file_private->syncobjs);
 }
 
 int

diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h
index 58662ad2d1a32dec774d09e8d90a1ad688422dcf..66e023faf7fc56b371b8ec40415290f0571d38df 100644 (file)
--- a/include/drm/drm_file.h
+++ b/include/drm/drm_file.h
@@ -248,10 +248,8 @@ struct drm_file {
         */
        struct xarray objects;
 
-       /** @syncobj_idr: Mapping of sync object handles to object pointers. */
-       struct idr syncobj_idr;
-       /** @syncobj_table_lock: Protects @syncobj_idr. */
-       spinlock_t syncobj_table_lock;
+       /** @syncobjs: Mapping of sync object handles to object pointers. */
+       struct xarray syncobjs;
 
        /** @filp: Pointer to the core file structure. */
        struct file *filp;