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

2.6 sysfs patches + stubs in drmP.h for 2.4 compatibility

main
Dave Airlie 2004-04-08 13:11:04 +00:00
parent c3e2685e82
commit 13724f032e
4 changed files with 88 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
linux-core/drmP.h
View File

@ -243,6 +243,18 @@ static inline unsigned iminor(struct inode *inode)
#define old_encode_dev(x) (x) #define old_encode_dev(x) (x)
struct class_simple;
struct device;
static inline void *class_simple_device_add(struct class_simple *cs, dev_t dev, struct device *device, const char *fmt, ...)
{ return NULL;}
static inline void class_simple_device_remove(dev_t dev){};
static inline void class_simple_destroy(struct class_simple *cs){};
static inline struct class_simple *class_simple_create(struct module *owner, char *name) { return NULL; }
#endif #endif
#ifndef REMAP_PAGE_RANGE_5_ARGS #ifndef REMAP_PAGE_RANGE_5_ARGS

35
linux-core/drm_stub.c
View File

@ -36,6 +36,8 @@
#define DRM_STUB_MAXCARDS 16 /* Enough for one machine */ #define DRM_STUB_MAXCARDS 16 /* Enough for one machine */
static struct class_simple *drm_class;
/** Stub list. One for each minor. */ /** Stub list. One for each minor. */
static struct drm_stub_list { static struct drm_stub_list {
const char *name; const char *name;
@ -118,6 +120,7 @@ static int DRM(stub_getminor)(const char *name, struct file_operations *fops,
DRM(stub_root) = DRM(proc_init)(dev, i, DRM(stub_root), DRM(stub_root) = DRM(proc_init)(dev, i, DRM(stub_root),
&DRM(stub_list)[i] &DRM(stub_list)[i]
.dev_root); .dev_root);
class_simple_device_add(drm_class, MKDEV(DRM_MAJOR, i), NULL, name);
return i; return i;
} }
} }
@ -142,6 +145,7 @@ static int DRM(stub_putminor)(int minor)
DRM(proc_cleanup)(minor, DRM(stub_root), DRM(proc_cleanup)(minor, DRM(stub_root),
DRM(stub_list)[minor].dev_root); DRM(stub_list)[minor].dev_root);
if (minor) { if (minor) {
class_simple_device_remove(MKDEV(DRM_MAJOR, minor));
inter_module_put("drm"); inter_module_put("drm");
} else { } else {
inter_module_unregister("drm"); inter_module_unregister("drm");
@ -149,6 +153,8 @@ static int DRM(stub_putminor)(int minor)
sizeof(*DRM(stub_list)) * DRM_STUB_MAXCARDS, sizeof(*DRM(stub_list)) * DRM_STUB_MAXCARDS,
DRM_MEM_STUB); DRM_MEM_STUB);
unregister_chrdev(DRM_MAJOR, "drm"); unregister_chrdev(DRM_MAJOR, "drm");
class_simple_device_remove(MKDEV(DRM_MAJOR, minor));
class_simple_destroy(drm_class);
} }
return 0; return 0;
} }
@ -171,10 +177,23 @@ int DRM(stub_register)(const char *name, struct file_operations *fops,
drm_device_t *dev) drm_device_t *dev)
{ {
struct drm_stub_info *i = NULL; struct drm_stub_info *i = NULL;
int ret1;
int ret2;
DRM_DEBUG("\n"); DRM_DEBUG("\n");
if (register_chrdev(DRM_MAJOR, "drm", &DRM(stub_fops))) ret1 = register_chrdev(DRM_MAJOR, "drm", &DRM(stub_fops));
if (!ret1) {
drm_class = class_simple_create(THIS_MODULE, "drm");
if (IS_ERR(drm_class)) {
printk (KERN_ERR "Error creating drm class.\n");
unregister_chrdev(DRM_MAJOR, "drm");
return PTR_ERR(drm_class);
}
}
else if (ret1 == -EBUSY)
i = (struct drm_stub_info *)inter_module_get("drm"); i = (struct drm_stub_info *)inter_module_get("drm");
else
return -1;
if (i) { if (i) {
/* Already registered */ /* Already registered */
@ -187,8 +206,18 @@ int DRM(stub_register)(const char *name, struct file_operations *fops,
DRM_DEBUG("calling inter_module_register\n"); DRM_DEBUG("calling inter_module_register\n");
inter_module_register("drm", THIS_MODULE, &DRM(stub_info)); inter_module_register("drm", THIS_MODULE, &DRM(stub_info));
} }
if (DRM(stub_info).info_register) if (DRM(stub_info).info_register) {
return DRM(stub_info).info_register(name, fops, dev); ret2 = DRM(stub_info).info_register(name, fops, dev);
if (ret2) {
if (!ret1) {
unregister_chrdev(DRM_MAJOR, "drm");
class_simple_destroy(drm_class);
}
if (!i)
inter_module_unregister("drm");
}
return ret2;
}
return -1; return -1;
} }

12
linux/drmP.h
View File

@ -243,6 +243,18 @@ static inline unsigned iminor(struct inode *inode)
#define old_encode_dev(x) (x) #define old_encode_dev(x) (x)
struct class_simple;
struct device;
static inline void *class_simple_device_add(struct class_simple *cs, dev_t dev, struct device *device, const char *fmt, ...)
{ return NULL;}
static inline void class_simple_device_remove(dev_t dev){};
static inline void class_simple_destroy(struct class_simple *cs){};
static inline struct class_simple *class_simple_create(struct module *owner, char *name) { return NULL; }
#endif #endif
#ifndef REMAP_PAGE_RANGE_5_ARGS #ifndef REMAP_PAGE_RANGE_5_ARGS

35
linux/drm_stub.h
View File

@ -36,6 +36,8 @@
#define DRM_STUB_MAXCARDS 16 /* Enough for one machine */ #define DRM_STUB_MAXCARDS 16 /* Enough for one machine */
static struct class_simple *drm_class;
/** Stub list. One for each minor. */ /** Stub list. One for each minor. */
static struct drm_stub_list { static struct drm_stub_list {
const char *name; const char *name;
@ -118,6 +120,7 @@ static int DRM(stub_getminor)(const char *name, struct file_operations *fops,
DRM(stub_root) = DRM(proc_init)(dev, i, DRM(stub_root), DRM(stub_root) = DRM(proc_init)(dev, i, DRM(stub_root),
&DRM(stub_list)[i] &DRM(stub_list)[i]
.dev_root); .dev_root);
class_simple_device_add(drm_class, MKDEV(DRM_MAJOR, i), NULL, name);
return i; return i;
} }
} }
@ -142,6 +145,7 @@ static int DRM(stub_putminor)(int minor)
DRM(proc_cleanup)(minor, DRM(stub_root), DRM(proc_cleanup)(minor, DRM(stub_root),
DRM(stub_list)[minor].dev_root); DRM(stub_list)[minor].dev_root);
if (minor) { if (minor) {
class_simple_device_remove(MKDEV(DRM_MAJOR, minor));
inter_module_put("drm"); inter_module_put("drm");
} else { } else {
inter_module_unregister("drm"); inter_module_unregister("drm");
@ -149,6 +153,8 @@ static int DRM(stub_putminor)(int minor)
sizeof(*DRM(stub_list)) * DRM_STUB_MAXCARDS, sizeof(*DRM(stub_list)) * DRM_STUB_MAXCARDS,
DRM_MEM_STUB); DRM_MEM_STUB);
unregister_chrdev(DRM_MAJOR, "drm"); unregister_chrdev(DRM_MAJOR, "drm");
class_simple_device_remove(MKDEV(DRM_MAJOR, minor));
class_simple_destroy(drm_class);
} }
return 0; return 0;
} }
@ -171,10 +177,23 @@ int DRM(stub_register)(const char *name, struct file_operations *fops,
drm_device_t *dev) drm_device_t *dev)
{ {
struct drm_stub_info *i = NULL; struct drm_stub_info *i = NULL;
int ret1;
int ret2;
DRM_DEBUG("\n"); DRM_DEBUG("\n");
if (register_chrdev(DRM_MAJOR, "drm", &DRM(stub_fops))) ret1 = register_chrdev(DRM_MAJOR, "drm", &DRM(stub_fops));
if (!ret1) {
drm_class = class_simple_create(THIS_MODULE, "drm");
if (IS_ERR(drm_class)) {
printk (KERN_ERR "Error creating drm class.\n");
unregister_chrdev(DRM_MAJOR, "drm");
return PTR_ERR(drm_class);
}
}
else if (ret1 == -EBUSY)
i = (struct drm_stub_info *)inter_module_get("drm"); i = (struct drm_stub_info *)inter_module_get("drm");
else
return -1;
if (i) { if (i) {
/* Already registered */ /* Already registered */
@ -187,8 +206,18 @@ int DRM(stub_register)(const char *name, struct file_operations *fops,
DRM_DEBUG("calling inter_module_register\n"); DRM_DEBUG("calling inter_module_register\n");
inter_module_register("drm", THIS_MODULE, &DRM(stub_info)); inter_module_register("drm", THIS_MODULE, &DRM(stub_info));
} }
if (DRM(stub_info).info_register) if (DRM(stub_info).info_register) {
return DRM(stub_info).info_register(name, fops, dev); ret2 = DRM(stub_info).info_register(name, fops, dev);
if (ret2) {
if (!ret1) {
unregister_chrdev(DRM_MAJOR, "drm");
class_simple_destroy(drm_class);
}
if (!i)
inter_module_unregister("drm");
}
return ret2;
}
return -1; return -1;
} }