Merge branch '3.5-merge-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nab...

[~andy/linux] / include / drm / drmP.h

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index efd12490376144d195b8798d903c98d3c377f92d..31ad880ca2efa56e380173b463ef6bc939ba837e 100644 (file)
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -755,11 +755,11 @@ struct drm_driver {
         * @dev: DRM device
         * @crtc: counter to fetch
         *
-        * Driver callback for fetching a raw hardware vblank counter
-        * for @crtc.  If a device doesn't have a hardware counter, the
-        * driver can simply return the value of drm_vblank_count and
-        * make the enable_vblank() and disable_vblank() hooks into no-ops,
-        * leaving interrupts enabled at all times.
+        * Driver callback for fetching a raw hardware vblank counter for @crtc.
+        * If a device doesn't have a hardware counter, the driver can simply
+        * return the value of drm_vblank_count. The DRM core will account for
+        * missed vblank events while interrupts where disabled based on system
+        * timestamps.
         *
         * Wraparound handling and loss of events due to modesetting is dealt
         * with in the DRM core code.
@@ -941,7 +941,7 @@ struct drm_driver {
                            uint32_t handle);
 
        /* Driver private ops for this object */
-       struct vm_operations_struct *gem_vm_ops;
+       const struct vm_operations_struct *gem_vm_ops;
 
        int major;
        int minor;
@@ -1558,6 +1558,8 @@ extern int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data,
 extern int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data,
                                        struct drm_file *file_priv);
 
+extern int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages,
+                                           dma_addr_t *addrs, int max_pages);
 extern struct sg_table *drm_prime_pages_to_sg(struct page **pages, int nr_pages);
 extern void drm_prime_gem_destroy(struct drm_gem_object *obj, struct sg_table *sg);