drm: Convert tile_idr to XArray

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

diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index b3f2cf7eae9c3388ef8b544346dbc5b649174bc7..b33e1633971df38165b541d1884b8b003975c9a2 100644 (file)
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -2150,9 +2150,7 @@ static void drm_tile_group_free(struct kref *kref)
 {
        struct drm_tile_group *tg = container_of(kref, struct drm_tile_group, refcount);
        struct drm_device *dev = tg->dev;
-       mutex_lock(&dev->mode_config.idr_mutex);
-       idr_remove(&dev->mode_config.tile_idr, tg->id);
-       mutex_unlock(&dev->mode_config.idr_mutex);
+       xa_erase(&dev->mode_config.tiles, tg->id);
        kfree(tg);
 }
 
@@ -2184,18 +2182,18 @@ struct drm_tile_group *drm_mode_get_tile_group(struct drm_device *dev,
                                               char topology[8])
 {
        struct drm_tile_group *tg;
-       int id;
-       mutex_lock(&dev->mode_config.idr_mutex);
-       idr_for_each_entry(&dev->mode_config.tile_idr, tg, id) {
+       unsigned long id;
+
+       xa_lock(&dev->mode_config.tiles);
+       xa_for_each(&dev->mode_config.tiles, id, tg) {
                if (!memcmp(tg->group_data, topology, 8)) {
                        if (!kref_get_unless_zero(&tg->refcount))
                                tg = NULL;
-                       mutex_unlock(&dev->mode_config.idr_mutex);
-                       return tg;
+                       break;
                }
        }
-       mutex_unlock(&dev->mode_config.idr_mutex);
-       return NULL;
+       xa_unlock(&dev->mode_config.tiles);
+       return tg;
 }
 EXPORT_SYMBOL(drm_mode_get_tile_group);
 
@@ -2224,16 +2222,13 @@ struct drm_tile_group *drm_mode_create_tile_group(struct drm_device *dev,
        memcpy(tg->group_data, topology, 8);
        tg->dev = dev;
 
-       mutex_lock(&dev->mode_config.idr_mutex);
-       ret = idr_alloc(&dev->mode_config.tile_idr, tg, 1, 0, GFP_KERNEL);
-       if (ret >= 0) {
-               tg->id = ret;
-       } else {
+       ret = xa_alloc(&dev->mode_config.tiles, &tg->id, tg, xa_limit_32b,
+                       GFP_KERNEL);
+       if (ret < 0) {
                kfree(tg);
                tg = NULL;
        }
 
-       mutex_unlock(&dev->mode_config.idr_mutex);
        return tg;
 }
 EXPORT_SYMBOL(drm_mode_create_tile_group);

diff --git a/drivers/gpu/drm/drm_mode_config.c b/drivers/gpu/drm/drm_mode_config.c
index 7bc03c3c154ffc56ecadb023255cfa0310440669..f63cf393f624e6e5bdab31dde10dd4838a389fff 100644 (file)
--- a/drivers/gpu/drm/drm_mode_config.c
+++ b/drivers/gpu/drm/drm_mode_config.c
@@ -400,7 +400,7 @@ void drm_mode_config_init(struct drm_device *dev)
        INIT_LIST_HEAD(&dev->mode_config.plane_list);
        INIT_LIST_HEAD(&dev->mode_config.privobj_list);
        idr_init(&dev->mode_config.object_idr);
-       idr_init(&dev->mode_config.tile_idr);
+       xa_init_flags(&dev->mode_config.tiles, XA_FLAGS_ALLOC1);
        ida_init(&dev->mode_config.connector_ida);
        spin_lock_init(&dev->mode_config.connector_list_lock);
 
@@ -501,7 +501,6 @@ void drm_mode_config_cleanup(struct drm_device *dev)
        }
 
        ida_destroy(&dev->mode_config.connector_ida);
-       idr_destroy(&dev->mode_config.tile_idr);
        idr_destroy(&dev->mode_config.object_idr);
        drm_modeset_lock_fini(&dev->mode_config.connection_mutex);
 }

diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h
index f57eea0481e0fd18a79d0c1178108619ae5e0a38..c4d96f906eb1a74db911eeaf156bc24544120ec9 100644 (file)
--- a/include/drm/drm_mode_config.h
+++ b/include/drm/drm_mode_config.h
@@ -391,8 +391,8 @@ struct drm_mode_config {
        /**
         * @idr_mutex:
         *
-        * Mutex for KMS ID allocation and management. Protects both @object_idr
-        * and @tile_idr.
+        * Mutex for KMS ID allocation and management. Protects the
+        * objects in @object_idr.
         */
        struct mutex idr_mutex;
 
@@ -405,12 +405,12 @@ struct drm_mode_config {
        struct idr object_idr;
 
        /**
-        * @tile_idr:
+        * @tiles:
         *
-        * Use this idr for allocating new IDs for tiled sinks like use in some
-        * high-res DP MST screens.
+        * Use this for allocating new IDs for tiled sinks like those
+        * used in some high-res DP MST screens.
         */
-       struct idr tile_idr;
+       struct xarray tiles;
 
        /** @fb_lock: Mutex to protect fb the global @fb_list and @num_fb. */
        struct mutex fb_lock;