drm: Convert lessee_idr to XArray

Part of the mass conversion of IDR users to the XArray API.

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

diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c
index 89e72ff32b629c1968f48e97895df2a48ae0627e..c0e9808aa5123776e5cb035baedc08cf7336b442 100644 (file)
--- a/drivers/gpu/drm/drm_auth.c
+++ b/drivers/gpu/drm/drm_auth.c
@@ -116,7 +116,7 @@ struct drm_master *drm_master_create(struct drm_device *dev)
        INIT_LIST_HEAD(&master->lessees);
        INIT_LIST_HEAD(&master->lessee_list);
        idr_init(&master->leases);
-       idr_init(&master->lessee_idr);
+       xa_init_flags(&master->lessee_xa, XA_FLAGS_ALLOC1);
 
        return master;
 }
@@ -337,7 +337,6 @@ static void drm_master_destroy(struct kref *kref)
        drm_legacy_master_rmmaps(dev, master);
 
        idr_destroy(&master->leases);
-       idr_destroy(&master->lessee_idr);
 
        kfree(master->unique);
        kfree(master);

diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c
index b481cafdde280bbaddf0e9168c448fafba95d095..40a342d9e0343b2f927771d928fa2498a5f83460 100644 (file)
--- a/drivers/gpu/drm/drm_lease.c
+++ b/drivers/gpu/drm/drm_lease.c
@@ -50,7 +50,7 @@ static struct drm_master*
 _drm_find_lessee(struct drm_master *master, int lessee_id)
 {
        lockdep_assert_held(&master->dev->mode_config.idr_mutex);
-       return idr_find(&drm_lease_owner(master)->lessee_idr, lessee_id);
+       return xa_load(&drm_lease_owner(master)->lessee_xa, lessee_id);
 }
 
 /**
@@ -199,7 +199,6 @@ static struct drm_master *drm_lease_create(struct drm_master *lessor, struct idr
        int error;
        struct drm_master *lessee;
        int object;
-       int id;
        void *entry;
 
        DRM_DEBUG_LEASE("lessor %d\n", lessor->lessee_id);
@@ -226,13 +225,11 @@ static struct drm_master *drm_lease_create(struct drm_master *lessor, struct idr
        }
 
        /* Insert the new lessee into the tree */
-       id = idr_alloc(&(drm_lease_owner(lessor)->lessee_idr), lessee, 1, 0, GFP_KERNEL);
-       if (id < 0) {
-               error = id;
+       error = xa_alloc(&drm_lease_owner(lessor)->lessee_xa,
+                       &lessee->lessee_id, lessee, xa_limit_32b, GFP_KERNEL);
+       if (error < 0)
                goto out_lessee;
-       }
 
-       lessee->lessee_id = id;
        lessee->lessor = drm_master_get(lessor);
        list_add_tail(&lessee->lessee_list, &lessor->lessees);
 
@@ -273,10 +270,10 @@ void drm_lease_destroy(struct drm_master *master)
         */
        WARN_ON(!list_empty(&master->lessees));
 
-       /* Remove this master from the lessee idr in the owner */
+       /* Remove this master from the lessee array in the owner */
        if (master->lessee_id != 0) {
                DRM_DEBUG_LEASE("remove master %d from device list of lessees\n", master->lessee_id);
-               idr_remove(&(drm_lease_owner(master)->lessee_idr), master->lessee_id);
+               xa_erase(&drm_lease_owner(master)->lessee_xa, master->lessee_id);
        }
 
        /* Remove this master from any lessee list it may be on */

diff --git a/include/drm/drm_auth.h b/include/drm/drm_auth.h
index 28f94e7ccf822d9d88500a629d7f6c121837be50..735ea2839236ee7e89a88f1e2917c70923e0f882 100644 (file)
--- a/include/drm/drm_auth.h
+++ b/include/drm/drm_auth.h
@@ -98,7 +98,7 @@ struct drm_master {
        struct list_head lessee_list;
        struct list_head lessees;
        struct idr leases;
-       struct idr lessee_idr;
+       struct xarray lessee_xa;
        /* private: */
 #if IS_ENABLED(CONFIG_DRM_LEGACY)
        struct drm_lock_data lock;