drm: Rename crtc_idr as object_idr to KMS cleanups
Subsystems (2)
PATCH v2 1/1 drm: Rename crtc_idr as object_idr to KMS cleanups
This patch solves this TODO task:
drm_mode_config.crtc_idr is misnamed, since it contains all KMS object. Should be renamed to drm_mode_config.object_idr.
Signed-off-by Shayenne da Luz Moura <[email protected]>
---
Changes in v2:
- Make commit message more clear and change header file
drivers/gpu/drm/drm_lease.c | 6 +++--- drivers/gpu/drm/drm_mode_config.c | 4 ++-- drivers/gpu/drm/drm_mode_object.c | 8 ++++---- include/drm/drm_mode_config.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/drm_lease.c +3 -3
@@ -218,7 +218,7 @@ static struct drm_master *drm_lease_create(struct drm_master *lessor, struct idridr_for_each_entry (leases, entry, object) { error =0 ; -if (!idr_find (&dev->mode_config.crtc_idr, object)) +if (!idr_find (&dev->mode_config.object_idr, object)) error = -ENOENT ;else if (!_drm_lease_held_master (lessor, object)) error = -EACCES ;
@@ -434,7 +434,7 @@ static int fill_object_idr(struct drm_device *dev,/* * We're using an IDR to hold the set of leased * objects, but we don't need to point at the object's -* data structure from the lease as the main crtc_idr +* data structure from the lease as the main object_idr * will be used to actually find that. Instead, all we * really want is a 'leased/not-leased' result, for * which any non-NULL pointer will work fine.
@@ -675,7 +675,7 @@ int drm_mode_get_lease_ioctl(struct drm_device *dev,if (lessee->lessor ==NULL )/* owner can use all objects */ - object_idr = &lessee->dev->mode_config.crtc_idr; + object_idr = &lessee->dev->mode_config.object_idr;else /* lessee can only use allowed object */ object_idr = &lessee->leases;
drivers/gpu/drm/drm_mode_config.c +2 -2
@@ -381,7 +381,7 @@ void drm_mode_config_init(struct drm_device *dev)INIT_LIST_HEAD (&dev->mode_config.property_list);INIT_LIST_HEAD (&dev->mode_config.property_blob_list);INIT_LIST_HEAD (&dev->mode_config.plane_list); -idr_init (&dev->mode_config.crtc_idr); +idr_init (&dev->mode_config.object_idr);idr_init (&dev->mode_config.tile_idr);ida_init (&dev->mode_config.connector_ida);spin_lock_init (&dev->mode_config.connector_list_lock);
@@ -484,7 +484,7 @@ 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.crtc_idr); +idr_destroy (&dev->mode_config.object_idr);drm_modeset_lock_fini (&dev->mode_config.connection_mutex); }EXPORT_SYMBOL (drm_mode_config_cleanup);
drivers/gpu/drm/drm_mode_object.c +4 -4
@@ -38,7 +38,7 @@ int __drm_mode_object_add(struct drm_device *dev, struct drm_mode_object *obj,int ret;mutex_lock (&dev->mode_config.idr_mutex); - ret =idr_alloc (&dev->mode_config.crtc_idr, register_obj ? obj :NULL , + ret =idr_alloc (&dev->mode_config.object_idr, register_obj ? obj :NULL ,1 ,0 ,GFP_KERNEL );if (ret >=0 ) {/*
@@ -79,7 +79,7 @@ void drm_mode_object_register(struct drm_device *dev, struct drm_mode_object *obj) {mutex_lock (&dev->mode_config.idr_mutex); -idr_replace (&dev->mode_config.crtc_idr, obj, obj->id); +idr_replace (&dev->mode_config.object_idr, obj, obj->id);mutex_unlock (&dev->mode_config.idr_mutex); }
@@ -99,7 +99,7 @@ void drm_mode_object_unregister(struct drm_device *dev, {mutex_lock (&dev->mode_config.idr_mutex);if (object->id) { -idr_remove (&dev->mode_config.crtc_idr, object->id); +idr_remove (&dev->mode_config.object_idr, object->id); object->id =0 ; }mutex_unlock (&dev->mode_config.idr_mutex);
@@ -131,7 +131,7 @@ struct drm_mode_object *__drm_mode_object_find(struct drm_device *dev,struct drm_mode_object *obj =NULL ;mutex_lock (&dev->mode_config.idr_mutex); - obj =idr_find (&dev->mode_config.crtc_idr, id); + obj =idr_find (&dev->mode_config.object_idr, id);if (obj && type !=DRM_MODE_OBJECT_ANY && obj->type != type) obj =NULL ;if (obj && obj->id != id)
include/drm/drm_mode_config.h +3 -3
@@ -385,18 +385,18 @@ struct drm_mode_config {/** * @idr_mutex: * -* Mutex for KMS ID allocation and management. Protects both @crtc_idr +* Mutex for KMS ID allocation and management. Protects both @object_idr * and @tile_idr. */ struct mutex idr_mutex;/** -* @crtc_idr: +* @object_idr: * * Main KMS ID tracking object. Use this idr for all IDs, fb, crtc, * connector, modes - just makes life easier to have only one. */ -struct idr crtc_idr; +struct idr object_idr;/** * @tile_idr:
Signature · 1 line
2.19.1