korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-01 16:14:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 87767de835.

This is due to the depend commit has been reverted on upstream:
commit baad10973f ("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
This commit is contained in:
Qiang Yu 2023-04-04 08:26:00 +08:00
parent 7e4d0b09a9
commit 4ad17bf571
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/lima/lima_device.h
View File

@ -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 *

12
drivers/gpu/drm/lima/lima_drv.c
View File

@ -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);

1
drivers/gpu/drm/lima/lima_drv.h
View File

@ -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;
};