AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

drm/sysfs: fix hotplug regression since lifetime changes

Browse Source 
airlied:
The lifetime changes introduced in 5bdebb183c
tried to use device_create, however that led to the regression where dev->type
wasn't getting set correctly. First attempt at fixing it would have led to
a race, so this undoes the device_createa work and does it all manually
making sure the dev->type is setup before we register the device.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
David Herrmann 2013-11-21 20:50:50 +10:00 committed by Dave Airlie
parent c3bddbda36
commit 760c960bd6
1 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/gpu/drm/drm_sysfs.c
View File

@ -489,6 +489,11 @@ void drm_sysfs_hotplug_event(struct drm_device *dev)
} }
EXPORT_SYMBOL(drm_sysfs_hotplug_event); EXPORT_SYMBOL(drm_sysfs_hotplug_event);
static void drm_sysfs_release(struct device *dev)
{
kfree(dev);
}
/** /**
* drm_sysfs_device_add - adds a class device to sysfs for a character driver * drm_sysfs_device_add - adds a class device to sysfs for a character driver
* @dev: DRM device to be added * @dev: DRM device to be added
@ -501,6 +506,7 @@ EXPORT_SYMBOL(drm_sysfs_hotplug_event);
int drm_sysfs_device_add(struct drm_minor *minor) int drm_sysfs_device_add(struct drm_minor *minor)
{ {
char *minor_str; char *minor_str;
int r;
if (minor->type == DRM_MINOR_CONTROL) if (minor->type == DRM_MINOR_CONTROL)
minor_str = "controlD%d"; minor_str = "controlD%d";
@ -509,14 +515,34 @@ int drm_sysfs_device_add(struct drm_minor *minor)
else else
minor_str = "card%d"; minor_str = "card%d";
minor->kdev = device_create(drm_class, minor->dev->dev, minor->kdev = kzalloc(sizeof(*minor->kdev), GFP_KERNEL);
MKDEV(DRM_MAJOR, minor->index), if (!minor->dev) {
minor, minor_str, minor->index); r = -ENOMEM;
if (IS_ERR(minor->kdev)) { goto error;
DRM_ERROR("device create failed %ld\n", PTR_ERR(minor->kdev));
return PTR_ERR(minor->kdev);
} }
device_initialize(minor->kdev);
minor->kdev->devt = MKDEV(DRM_MAJOR, minor->index);
minor->kdev->class = drm_class;
minor->kdev->type = &drm_sysfs_device_minor;
minor->kdev->parent = minor->dev->dev;
minor->kdev->release = drm_sysfs_release;
dev_set_drvdata(minor->kdev, minor);
r = dev_set_name(minor->kdev, minor_str, minor->index);
if (r < 0)
goto error;
r = device_add(minor->kdev);
if (r < 0)
goto error;
return 0; return 0;
error:
DRM_ERROR("device create failed %d\n", r);
put_device(minor->kdev);
return r;
} }
/** /**
@ -529,7 +555,7 @@ int drm_sysfs_device_add(struct drm_minor *minor)
void drm_sysfs_device_remove(struct drm_minor *minor) void drm_sysfs_device_remove(struct drm_minor *minor)
{ {
if (minor->kdev) if (minor->kdev)
device_destroy(drm_class, MKDEV(DRM_MAJOR, minor->index)); device_unregister(minor->kdev);
minor->kdev = NULL; minor->kdev = NULL;
} }