[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/include/drm Adjust field...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cf24021cfe45
branches:  riastradh-drm2
changeset: 788240:cf24021cfe45
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 02:52:22 2013 +0000

description:
Adjust fields of struct drm_gem_object for uvm.

Add a struct uvm_object pointer gemo_uao for an anonymous object to
back shared memory, and a struct uvm_object gemo_uvmobj for custom
device page mapping.

In struct drm_driver, replace the Linux VM operations gem_vm_ops by
NetBSD UVM operations gem_uvm_ops, so that the compiler will catch
any extant references to the Linux structure that will need changing.

diffstat:

 sys/external/bsd/drm2/dist/include/drm/drmP.h |  12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diffs (32 lines):

diff -r 319f70feb0b9 -r cf24021cfe45 sys/external/bsd/drm2/dist/include/drm/drmP.h
--- a/sys/external/bsd/drm2/dist/include/drm/drmP.h     Wed Jul 24 02:52:06 2013 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drmP.h     Wed Jul 24 02:52:22 2013 +0000
@@ -755,8 +755,16 @@
        /** Related drm device */
        struct drm_device *dev;
 
+#ifdef __NetBSD__
+       /* UVM anonymous object for shared memory mappings.  */
+       struct uvm_object *gemo_shm_uao;
+
+       /* UVM object with custom pager ops for device memory mappings.  */
+       struct uvm_object gemo_uvmobj;
+#else
        /** File representing the shmem storage */
        struct file *filp;
+#endif
 
        /* Mapping info for this object */
        struct drm_map_list map_list;
@@ -1074,7 +1082,11 @@
                            uint32_t handle);
 
        /* Driver private ops for this object */
+#ifdef __NetBSD__
+       const struct uvm_pagerops *gem_uvm_ops;
+#else
        const struct vm_operations_struct *gem_vm_ops;
+#endif
 
        int major;
        int minor;