On Tue, Apr 26, 2016 at 1:29 PM, Daniel Vetter daniel.vetter@ffwll.ch wrote:
And again make sure it's a no-op for modern drivers, again with the exception of nouveau. Another case of dev->struct_mutex gone for modern drivers!
v2: Also add a DRIVER_* check like for all other maps functions to really short-circuit the code. And give drm_legacy_rmmap used by the dev unregister code the same treatment.
Signed-off-by: Daniel Vetter daniel.vetter@intel.com
Just one comment below.
Acked-by: Alex Deucher alexander.deucher@amd.com
drivers/gpu/drm/drm_bufs.c | 28 ++++++++++++++++++++++++---- drivers/gpu/drm/drm_drv.c | 10 +--------- include/drm/drm_legacy.h | 4 +++- 3 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index e8a12a4fd400..5a51633da033 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -542,18 +542,38 @@ int drm_legacy_rmmap_locked(struct drm_device *dev, struct drm_local_map *map) } EXPORT_SYMBOL(drm_legacy_rmmap_locked);
-int drm_legacy_rmmap(struct drm_device *dev, struct drm_local_map *map) +void drm_legacy_rmmap(struct drm_device *dev, struct drm_local_map *map) {
int ret;
if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) &&drm_core_check_feature(dev, DRIVER_MODESET))return; mutex_lock(&dev->struct_mutex);
ret = drm_legacy_rmmap_locked(dev, map);
drm_legacy_rmmap_locked(dev, map); mutex_unlock(&dev->struct_mutex);
return ret;
return;
Can drop this.
} EXPORT_SYMBOL(drm_legacy_rmmap);
+void drm_legacy_master_rmmaps(struct drm_device *dev, struct drm_master *master) +{
struct drm_map_list *r_list, *list_temp;if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) &&drm_core_check_feature(dev, DRIVER_MODESET))return;mutex_lock(&dev->struct_mutex);list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head) {if (r_list->master == master) {drm_legacy_rmmap_locked(dev, r_list->map);r_list = NULL;}}mutex_unlock(&dev->struct_mutex);+}
/* The rmmap ioctl appears to be unnecessary. All mappings are torn down on
- the last close of the device, and this is necessary for cleanup when things
- exit uncleanly. Therefore, having userland manually remove mappings seems
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 55273f8f3acb..e1fb52d4f72c 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -121,19 +121,11 @@ static void drm_master_destroy(struct kref *kref) { struct drm_master *master = container_of(kref, struct drm_master, refcount); struct drm_device *dev = master->minor->dev;
struct drm_map_list *r_list, *list_temp; if (dev->driver->master_destroy) dev->driver->master_destroy(dev, master);mutex_lock(&dev->struct_mutex);list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head) {if (r_list->master == master) {drm_legacy_rmmap_locked(dev, r_list->map);r_list = NULL;}}mutex_unlock(&dev->struct_mutex);
drm_legacy_master_rmmaps(dev, master); idr_destroy(&master->magic_map); kfree(master->unique);diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h index 3e698038dc7b..a5ef2c7e40f8 100644 --- a/include/drm/drm_legacy.h +++ b/include/drm/drm_legacy.h @@ -154,8 +154,10 @@ struct drm_map_list { int drm_legacy_addmap(struct drm_device *d, resource_size_t offset, unsigned int size, enum drm_map_type type, enum drm_map_flags flags, struct drm_local_map **map_p); -int drm_legacy_rmmap(struct drm_device *d, struct drm_local_map *map); +void drm_legacy_rmmap(struct drm_device *d, struct drm_local_map *map); int drm_legacy_rmmap_locked(struct drm_device *d, struct drm_local_map *map); +void drm_legacy_master_rmmaps(struct drm_device *dev,
struct drm_master *master);struct drm_local_map *drm_legacy_getsarea(struct drm_device *dev); int drm_legacy_mmap(struct file *filp, struct vm_area_struct *vma);
-- 2.8.1
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel