diff options
Diffstat (limited to 'include/drm/drmP.h')
-rw-r--r-- | include/drm/drmP.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 738b3a5faa12..9b7c2bb4bb44 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -886,6 +886,8 @@ struct drm_driver { | |||
886 | */ | 886 | */ |
887 | int (*gem_init_object) (struct drm_gem_object *obj); | 887 | int (*gem_init_object) (struct drm_gem_object *obj); |
888 | void (*gem_free_object) (struct drm_gem_object *obj); | 888 | void (*gem_free_object) (struct drm_gem_object *obj); |
889 | int (*gem_open_object) (struct drm_gem_object *, struct drm_file *); | ||
890 | void (*gem_close_object) (struct drm_gem_object *, struct drm_file *); | ||
889 | 891 | ||
890 | /* vga arb irq handler */ | 892 | /* vga arb irq handler */ |
891 | void (*vgaarb_irq)(struct drm_device *dev, bool state); | 893 | void (*vgaarb_irq)(struct drm_device *dev, bool state); |
@@ -1539,6 +1541,8 @@ struct drm_gem_object *drm_gem_object_alloc(struct drm_device *dev, | |||
1539 | size_t size); | 1541 | size_t size); |
1540 | int drm_gem_object_init(struct drm_device *dev, | 1542 | int drm_gem_object_init(struct drm_device *dev, |
1541 | struct drm_gem_object *obj, size_t size); | 1543 | struct drm_gem_object *obj, size_t size); |
1544 | int drm_gem_private_object_init(struct drm_device *dev, | ||
1545 | struct drm_gem_object *obj, size_t size); | ||
1542 | void drm_gem_object_handle_free(struct drm_gem_object *obj); | 1546 | void drm_gem_object_handle_free(struct drm_gem_object *obj); |
1543 | void drm_gem_vm_open(struct vm_area_struct *vma); | 1547 | void drm_gem_vm_open(struct vm_area_struct *vma); |
1544 | void drm_gem_vm_close(struct vm_area_struct *vma); | 1548 | void drm_gem_vm_close(struct vm_area_struct *vma); |
@@ -1672,13 +1676,6 @@ static __inline__ int drm_pci_device_is_agp(struct drm_device *dev) | |||
1672 | return pci_find_capability(dev->pdev, PCI_CAP_ID_AGP); | 1676 | return pci_find_capability(dev->pdev, PCI_CAP_ID_AGP); |
1673 | } | 1677 | } |
1674 | 1678 | ||
1675 | |||
1676 | static __inline__ int drm_pci_device_is_pcie(struct drm_device *dev) | ||
1677 | { | ||
1678 | return pci_find_capability(dev->pdev, PCI_CAP_ID_EXP); | ||
1679 | } | ||
1680 | |||
1681 | |||
1682 | extern int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver); | 1679 | extern int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver); |
1683 | extern void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver); | 1680 | extern void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver); |
1684 | extern int drm_get_pci_dev(struct pci_dev *pdev, | 1681 | extern int drm_get_pci_dev(struct pci_dev *pdev, |