Commit 4ad17bf5 authored by Qiang Yu's avatar Qiang Yu
Browse files

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



This reverts commit 87767de8.

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

Acked-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: default avatarQiang Yu <yuq825@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230404002601.24136-3-yq882255@163.com
parent 7e4d0b09

drivers/gpu/drm/lima/lima_device.h

+0 −3
Original line number Diff line number Diff line
@@ -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 *

drivers/gpu/drm/lima/lima_drv.c

+0 −12
Original line number Diff line number Diff line
@@ -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 @@ static int lima_drm_driver_open(struct drm_device *dev, struct drm_file *file) 
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);

drivers/gpu/drm/lima/lima_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

};