geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm_sysfs: update sysfs code from kernel

main
Dave Airlie 2007-09-20 14:01:29 +10:00
parent e349b58b4a
commit bc5423f168
3 changed files with 54 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
linux-core/drmP.h
View File

@ -1130,7 +1130,7 @@ extern int drm_put_head(struct drm_head * head);
extern unsigned int drm_debug; /* 1 to enable debug output */
extern unsigned int drm_cards_limit;
extern struct drm_head **drm_heads;
extern struct drm_sysfs_class *drm_class;
extern struct class *drm_class;
extern struct proc_dir_entry *drm_proc_root;
extern drm_local_map_t *drm_getsarea(struct drm_device *dev);
@ -1163,10 +1163,9 @@ extern void drm_pci_free(struct drm_device *dev, drm_dma_handle_t *dmah);
/* sysfs support (drm_sysfs.c) */
struct drm_sysfs_class;
extern struct drm_sysfs_class *drm_sysfs_create(struct module *owner,
char *name);
extern void drm_sysfs_destroy(struct drm_sysfs_class *cs);
extern struct class_device *drm_sysfs_device_add(struct drm_sysfs_class *cs,
extern struct class *drm_sysfs_create(struct module *owner, char *name);
extern void drm_sysfs_destroy(struct class *cs);
extern struct class_device *drm_sysfs_device_add(struct class *cs,
struct drm_head * head);
extern void drm_sysfs_device_remove(struct class_device *class_dev);

2
linux-core/drm_stub.c
View File

@ -51,7 +51,7 @@ module_param_named(cards_limit, drm_cards_limit, int, 0444);
module_param_named(debug, drm_debug, int, 0600);
struct drm_head **drm_heads;
struct drm_sysfs_class *drm_class;
struct class *drm_class;
struct proc_dir_entry *drm_proc_root;
static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,

163
linux-core/drm_sysfs.c
View File

@ -1,3 +1,4 @@
/*
* drm_sysfs.c - Modifications to drm_sysfs_class.c to support
* extra sysfs attribute from DRM. Normal drm_sysfs_class
@ -15,38 +16,8 @@
#include <linux/kdev_t.h>
#include <linux/err.h>
#include "drmP.h"
#include "drm_core.h"
struct drm_sysfs_class {
struct class_device_attribute attr;
struct class class;
};
#define to_drm_sysfs_class(d) container_of(d, struct drm_sysfs_class, class)
struct simple_dev {
dev_t dev;
struct class_device class_dev;
};
#define to_simple_dev(d) container_of(d, struct simple_dev, class_dev)
static void release_simple_dev(struct class_device *class_dev)
{
struct simple_dev *s_dev = to_simple_dev(class_dev);
kfree(s_dev);
}
static ssize_t show_dev(struct class_device *class_dev, char *buf)
{
struct simple_dev *s_dev = to_simple_dev(class_dev);
return print_dev_t(buf, s_dev->dev);
}
static void drm_sysfs_class_release(struct class *class)
{
struct drm_sysfs_class *cs = to_drm_sysfs_class(class);
kfree(cs);
}
#include "drmP.h"
/* Display the version of drm_core. This doesn't work right in current design */
static ssize_t version_show(struct class *dev, char *buf)
@ -68,42 +39,27 @@ static CLASS_ATTR(version, S_IRUGO, version_show, NULL);
* Note, the pointer created here is to be destroyed when finished by making a
* call to drm_sysfs_destroy().
*/
struct drm_sysfs_class *drm_sysfs_create(struct module *owner, char *name)
struct class *drm_sysfs_create(struct module *owner, char *name)
{
struct drm_sysfs_class *cs;
int retval;
struct class *class;
int err;
cs = kmalloc(sizeof(*cs), GFP_KERNEL);
if (!cs) {
retval = -ENOMEM;
goto error;
class = class_create(owner, name);
if (IS_ERR(class)) {
err = PTR_ERR(class);
goto err_out;
}
memset(cs, 0x00, sizeof(*cs));
cs->class.name = name;
cs->class.class_release = drm_sysfs_class_release;
cs->class.release = release_simple_dev;
err = class_create_file(class, &class_attr_version);
if (err)
goto err_out_class;
cs->attr.attr.name = "dev";
cs->attr.attr.mode = S_IRUGO;
cs->attr.attr.owner = owner;
cs->attr.show = show_dev;
cs->attr.store = NULL;
return class;
retval = class_register(&cs->class);
if (retval)
goto error;
retval = class_create_file(&cs->class, &class_attr_version);
if (retval)
goto error_with_class;
return cs;
error_with_class:
class_unregister(&cs->class);
error:
kfree(cs);
return ERR_PTR(retval);
err_out_class:
class_destroy(class);
err_out:
return ERR_PTR(err);
}
/**
@ -113,12 +69,13 @@ struct drm_sysfs_class *drm_sysfs_create(struct module *owner, char *name)
* Note, the pointer to be destroyed must have been created with a call to
* drm_sysfs_create().
*/
void drm_sysfs_destroy(struct drm_sysfs_class *cs)
void drm_sysfs_destroy(struct class *class)
{
if ((cs == NULL) || (IS_ERR(cs)))
if ((class == NULL) || (IS_ERR(class)))
return;
class_unregister(&cs->class);
class_remove_file(class, &class_attr_version);
class_destroy(class);
}
static ssize_t show_dri(struct class_device *class_device, char *buf)
@ -135,7 +92,7 @@ static struct class_device_attribute class_device_attrs[] = {
/**
* drm_sysfs_device_add - adds a class device to sysfs for a character driver
* @cs: pointer to the struct drm_sysfs_class that this device should be registered to.
* @cs: pointer to the struct class that this device should be registered to.
* @dev: the dev_t for the device to be added.
* @device: a pointer to a struct device that is assiociated with this class device.
* @fmt: string for the class device's name
@ -144,62 +101,42 @@ static struct class_device_attribute class_device_attrs[] = {
* class. A "dev" file will be created, showing the dev_t for the device. The
* pointer to the struct class_device will be returned from the call. Any further
* sysfs files that might be required can be created using this pointer.
* Note: the struct drm_sysfs_class passed to this function must have previously been
* Note: the struct class passed to this function must have previously been
* created with a call to drm_sysfs_create().
*/
struct class_device *drm_sysfs_device_add(struct drm_sysfs_class *cs,
struct drm_head * head)
struct class_device *drm_sysfs_device_add(struct class *cs, struct drm_head *head)
{
struct simple_dev *s_dev = NULL;
int i, retval;
struct class_device *class_dev;
int i, j, err;
if ((cs == NULL) || (IS_ERR(cs))) {
retval = -ENODEV;
goto error;
class_dev = class_device_create(cs, NULL,
MKDEV(DRM_MAJOR, head->minor),
&(head->dev->pdev)->dev,
"card%d", head->minor);
if (IS_ERR(class_dev)) {
err = PTR_ERR(class_dev);
goto err_out;
}
s_dev = kmalloc(sizeof(*s_dev), GFP_KERNEL);
if (!s_dev) {
retval = -ENOMEM;
goto error;
}
memset(s_dev, 0x00, sizeof(*s_dev));
s_dev->dev = MKDEV(DRM_MAJOR, head->minor);
s_dev->class_dev.dev = &head->dev->pdev->dev;
s_dev->class_dev.class = &cs->class;
snprintf(s_dev->class_dev.class_id, BUS_ID_SIZE, "card%d", head->minor);
retval = class_device_register(&s_dev->class_dev);
if (retval)
goto error;
retval = class_device_create_file(&s_dev->class_dev, &cs->attr);
if (retval)
goto error_with_device;
class_set_devdata(&s_dev->class_dev, head);
class_set_devdata(class_dev, head);
for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++) {
retval = class_device_create_file(&s_dev->class_dev,
&class_device_attrs[i]);
if (retval)
goto error_with_files;
err = class_device_create_file(class_dev,
&class_device_attrs[i]);
if (err)
goto err_out_files;
}
return &s_dev->class_dev;
return class_dev;
error_with_files:
while (i > 0)
class_device_remove_file(&s_dev->class_dev,
&class_device_attrs[--i]);
class_device_remove_file(&s_dev->class_dev, &cs->attr);
error_with_device:
class_device_unregister(&s_dev->class_dev);
error:
kfree(s_dev);
return ERR_PTR(retval);
err_out_files:
if (i > 0)
for (j = 0; j < i; j++)
class_device_remove_file(class_dev,
&class_device_attrs[i]);
class_device_unregister(class_dev);
err_out:
return ERR_PTR(err);
}
/**
@ -211,11 +148,9 @@ struct class_device *drm_sysfs_device_add(struct drm_sysfs_class *cs,
*/
void drm_sysfs_device_remove(struct class_device *class_dev)
{
struct simple_dev *s_dev = to_simple_dev(class_dev);
int i;
for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
class_device_remove_file(&s_dev->class_dev, &class_device_attrs[i]);
class_device_unregister(&s_dev->class_dev);
class_device_remove_file(class_dev, &class_device_attrs[i]);
class_device_unregister(class_dev);
}