Revert "drm/lima: allocate unique id per drm_file"

This reverts commit 87767de835edf527b879a363d518c33da68adb81.

This is due to the depend commit has been reverted on upstream:
commit baad10973fdb ("Revert "drm/scheduler: track GPU active time per entity"")

Acked-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230404002601.24136-3-yq882255@163.com

diff --git a/drivers/gpu/drm/lima/lima_device.h b/drivers/gpu/drm/lima/lima_device.h
index 71b2db60d161402eb30135d866fdf1d9e2c3c1b6..41b9d7b4bcc7a0128adda97379b6048735310096 100644 (file)
--- a/drivers/gpu/drm/lima/lima_device.h
+++ b/drivers/gpu/drm/lima/lima_device.h
@@ -106,9 +106,6 @@ struct lima_device {
        struct lima_dump_head dump;
        struct list_head error_task_list;
        struct mutex error_task_list_lock;
-
-       struct xarray active_contexts;
-       u32 next_context_id;
 };
 
 static inline struct lima_device *

diff --git a/drivers/gpu/drm/lima/lima_drv.c b/drivers/gpu/drm/lima/lima_drv.c
index f456a471216b1e4ec1e314c5c8fe3fb7f0eac5bd..39cab4a55f5728d2f8991bce764afed4b6c844d7 100644 (file)
--- a/drivers/gpu/drm/lima/lima_drv.c
+++ b/drivers/gpu/drm/lima/lima_drv.c
@@ -218,11 +218,6 @@ static int lima_drm_driver_open(struct drm_device *dev, struct drm_file *file)
        if (!priv)
                return -ENOMEM;
 
-       err = xa_alloc_cyclic(&ldev->active_contexts, &priv->id, priv,
-                             xa_limit_32b, &ldev->next_context_id, GFP_KERNEL);
-       if (err < 0)
-               goto err_out0;
-
        priv->vm = lima_vm_create(ldev);
        if (!priv->vm) {
                err = -ENOMEM;
@@ -242,9 +237,6 @@ err_out0:
 static void lima_drm_driver_postclose(struct drm_device *dev, struct drm_file *file)
 {
        struct lima_drm_priv *priv = file->driver_priv;
-       struct lima_device *ldev = to_lima_dev(dev);
-
-       xa_erase(&ldev->active_contexts, priv->id);
 
        lima_ctx_mgr_fini(&priv->ctx_mgr);
        lima_vm_put(priv->vm);
@@ -396,8 +388,6 @@ static int lima_pdev_probe(struct platform_device *pdev)
        ldev->dev = &pdev->dev;
        ldev->id = (enum lima_gpu_id)of_device_get_match_data(&pdev->dev);
 
-       xa_init_flags(&ldev->active_contexts, XA_FLAGS_ALLOC);
-
        platform_set_drvdata(pdev, ldev);
 
        /* Allocate and initialize the DRM device. */
@@ -456,8 +446,6 @@ static int lima_pdev_remove(struct platform_device *pdev)
        struct lima_device *ldev = platform_get_drvdata(pdev);
        struct drm_device *ddev = ldev->ddev;
 
-       xa_destroy(&ldev->active_contexts);
-
        sysfs_remove_bin_file(&ldev->dev->kobj, &lima_error_state_attr);
 
        drm_dev_unregister(ddev);

diff --git a/drivers/gpu/drm/lima/lima_drv.h b/drivers/gpu/drm/lima/lima_drv.h
index e49b7ab651d0c5fe5f949492ecd51501a512d58c..c738d288547b508ec29574be738a72c452c87796 100644 (file)
--- a/drivers/gpu/drm/lima/lima_drv.h
+++ b/drivers/gpu/drm/lima/lima_drv.h
@@ -20,7 +20,6 @@ struct lima_sched_task;
 struct drm_lima_gem_submit_bo;
 
 struct lima_drm_priv {
-       int id;
        struct lima_vm *vm;
        struct lima_ctx_mgr ctx_mgr;
 };