diff options
Diffstat (limited to 'drivers/char/drm/drmP.h')
-rw-r--r-- | drivers/char/drm/drmP.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index 36caf93db30..19d3be5c4b2 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h | |||
@@ -568,6 +568,8 @@ struct drm_driver { | |||
568 | void (*postclose) (struct drm_device *, struct drm_file *); | 568 | void (*postclose) (struct drm_device *, struct drm_file *); |
569 | void (*lastclose) (struct drm_device *); | 569 | void (*lastclose) (struct drm_device *); |
570 | int (*unload) (struct drm_device *); | 570 | int (*unload) (struct drm_device *); |
571 | int (*suspend) (struct drm_device *); | ||
572 | int (*resume) (struct drm_device *); | ||
571 | int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv); | 573 | int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv); |
572 | void (*dma_ready) (struct drm_device *); | 574 | void (*dma_ready) (struct drm_device *); |
573 | int (*dma_quiescent) (struct drm_device *); | 575 | int (*dma_quiescent) (struct drm_device *); |
@@ -643,6 +645,7 @@ struct drm_head { | |||
643 | * may contain multiple heads. | 645 | * may contain multiple heads. |
644 | */ | 646 | */ |
645 | struct drm_device { | 647 | struct drm_device { |
648 | struct device dev; /**< Linux device */ | ||
646 | char *unique; /**< Unique identifier: e.g., busid */ | 649 | char *unique; /**< Unique identifier: e.g., busid */ |
647 | int unique_len; /**< Length of unique field */ | 650 | int unique_len; /**< Length of unique field */ |
648 | char *devname; /**< For /proc/interrupts */ | 651 | char *devname; /**< For /proc/interrupts */ |
@@ -1063,11 +1066,11 @@ extern void __drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah); | |||
1063 | extern void drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah); | 1066 | extern void drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah); |
1064 | 1067 | ||
1065 | /* sysfs support (drm_sysfs.c) */ | 1068 | /* sysfs support (drm_sysfs.c) */ |
1069 | struct drm_sysfs_class; | ||
1066 | extern struct class *drm_sysfs_create(struct module *owner, char *name); | 1070 | extern struct class *drm_sysfs_create(struct module *owner, char *name); |
1067 | extern void drm_sysfs_destroy(struct class *cs); | 1071 | extern void drm_sysfs_destroy(void); |
1068 | extern struct class_device *drm_sysfs_device_add(struct class *cs, | 1072 | extern int drm_sysfs_device_add(struct drm_device *dev, struct drm_head *head); |
1069 | struct drm_head *head); | 1073 | extern void drm_sysfs_device_remove(struct drm_device *dev); |
1070 | extern void drm_sysfs_device_remove(struct class_device *class_dev); | ||
1071 | 1074 | ||
1072 | /* | 1075 | /* |
1073 | * Basic memory manager support (drm_mm.c) | 1076 | * Basic memory manager support (drm_mm.c) |