Merge branch 'upstream'

merge and port to DragonFly

Conflicts:
	src/Makefile
	src/nv-freebsd.h
	src/nvidia_ctl.c
	src/nvidia_os.c
	src/nvidia_subr.c

diff --cc obj/libGLcore.so.1
index 23edda3,6cd08cf..baabaf4
Binary files differ

diff --cc src/Makefile
index 75d0c49,3bb7d3a..06ba84c
--- 1/src/Makefile
--- 2/src/Makefile
+++ b/src/Makefile
@@@ -11,9 -11,9 +11,9 @@@ KMODDIR?=     /boot/module
  .endif
  
  SRCS=         nvidia_ctl.c nvidia_dev.c nvidia_linux.c nvidia_os.c nvidia_os_pci.c nvidia_os_registry.c nvidia_pci.c nvidia_subr.c nvidia_sysctl.c nvidia_i2c.c 
 -SRCS+=                device_if.h bus_if.h pci_if.h vnode_if.h
 +SRCS+=                device_if.h bus_if.h pci_if.h
- CFLAGS+=      -I${NVIDIA_ROOT}/src -DNV_VERSION_STRING=\"169.07\"
+ CFLAGS+=      -I${NVIDIA_ROOT}/src -DNV_VERSION_STRING=\"180.29\"
 -CFLAGS+=      -D__KERNEL__ -DNVRM -UDEBUG -U_DEBUG -DNDEBUG -O 
 +CFLAGS+=      -D__KERNEL__ -DNVRM -DDEBUG -D_DEBUG -UNDEBUG -O 
  
  OBJS+=                ${RMOBJ}
  .if ${BSDVER} >= 600000

diff --cc src/cpuopsys.h
index 788f64f,215fd4d..0c9480c
--- 1/src/cpuopsys.h
--- 2/src/cpuopsys.h
+++ b/src/cpuopsys.h
@@@ -69,6 -67,6 +67,10 @@@
  #   define NV_BSD
  #endif // defined(__FreeBSD__)
  
++#if defined(__DragonFly__)
++#   define NV_BSD
++#endif // defined(__DragonFly__)
++
  // XXXar don't define NV_UNIX on MacOSX or vxworks or dos or QNX
  #if (defined(__unix__) || defined(__unix) ) && !defined(macosx) && !defined(vxworks) && !defined(__DJGPP__) && !defined(NV_UNIX) && !defined(__QNX__) && !defined(__QNXNTO__)// XXX until removed from Makefiles
  #   define NV_UNIX

diff --cc src/nv-freebsd.h
index 3e258de,6f26ea3..bea8892
--- 1/src/nv-freebsd.h
--- 2/src/nv-freebsd.h
+++ b/src/nv-freebsd.h
@@@ -21,8 -21,10 +21,11 @@@
  
  #include <sys/param.h>
  
 +#ifdef __FreeBSD__
- #if __FreeBSD_version >= 700000
+ #if __FreeBSD_version >= 800000
+ #error This driver does not support FreeBSD 8.x/-CURRENT!
+ #endif
+ #if __FreeBSD_version >= 700000 && __FreeBSD_version < 700055
  #error This driver does not support FreeBSD 7.x/-CURRENT!
  #endif
  #if __FreeBSD_version >= 600000 && __FreeBSD_version < 600034
@@@ -53,18 -50,11 +56,19 @@@
  #include <sys/sysctl.h>
  
  #include <machine/cpu.h>
 +#ifdef __FreeBSD__
  #include <machine/resource.h>
 +#else
 +#include <sys/resource.h>
 +#endif
  #include <machine/clock.h>
  #include <machine/stdarg.h>
 +#ifdef __FreeBSD__
  #include <machine/bus.h>
+ #include <machine/specialreg.h>
 +#else
 +#include <sys/bus.h>
 +#endif
  
  #include <sys/conf.h>
  #include <sys/rman.h>
@@@ -112,14 -95,13 +116,18 @@@
  #include <dev/pci/pcireg.h>
  #include <dev/pci/pcivar.h>
  #include <sys/kdb.h>
 +#else
 +#include <bus/pci/pcireg.h>
 +#include <bus/pci/pcivar.h>
 +#endif
  #include <sys/filedesc.h>
  
+ #if __FreeBSD_version >= 700055
+ #include <sys/priv.h>
+ #endif
+ 
  #include <sys/lock.h>
 +#ifdef __FreeBSD__
  #include <sys/mutex.h>
  #include <sys/sx.h>
  #include <sys/condvar.h>
@@@ -265,8 -243,6 +274,7 @@@ struct nvidia_softc 
  
  } nvidia_softc_t;
  
- 
 +#define CDEV_MAJOR      180
  #define CDEV_CTL_MINOR  255
  
  extern devclass_t nvidia_devclass;
@@@ -276,15 -252,82 +284,99 @@@ extern nv_state_t nvidia_ctl_state
  
  extern const char *pNVRM_ID;
  
++typedef struct thread d_thread_t;
++#define malloc        kmalloc
++#define sprintf       ksprintf
++__inline static void
++free(void *addr, struct malloc_type *type)
++{
++    if (addr != NULL)
++      kfree(addr, type);
++}
++
++#define pte_load(p)   (*(p))
++#define pte_store(p, v) (*(p) = (v))
++#define pte_clear(p) pte_store((p), 0)
++void pmap_invalidate_range(struct pmap *pmap, vm_offset_t sva, vm_offset_t eva);
++
  #define PCIR_CAP_LIST_ID   0x00
  #define PCIR_CAP_LIST_NEXT 0x01
  #define PCIR_CAP_ID_AGP    0x02
  #define PCIR_CAP_ID_EXP    0x10
  
- #ifndef PCIS_DISPLAY_3D
- #define PCIS_DISPLAY_3D    0x02
+ #if !defined(PCIS_DISPLAY_3D)
+ #define PCIS_DISPLAY_3D    0x002
+ #endif
+ #if !defined(PCIM_CMD_INTXDIS)
+ #define PCIM_CMD_INTXDIS   0x400
+ #endif
+ 
+ #if !defined(PAT_UNCACHEABLE)
+ #define PAT_UNCACHEABLE         0x00
+ #endif
+ #if !defined(PAT_WRITE_COMBINING)
+ #define PAT_WRITE_COMBINING     0x01
+ #endif
+ #if !defined(PAT_WRITE_BACK)
+ #define PAT_WRITE_BACK          0x06
+ #endif
+ 
 -#if __FreeBSD_version < 602110 || __FreeBSD_version >= 700000 && __FreeBSD_version < 700055
++#if defined(__DragonFly__) || \
++      (__FreeBSD_version < 602110 || __FreeBSD_version >= 700000 && __FreeBSD_version < 700055)
+ static inline int pmap_change_attr(vm_offset_t va, vm_size_t size, int mode)
+ {
+     vm_offset_t tmp;
+     pt_entry_t *ptep;
+ 
+     if (mode == PAT_UNCACHEABLE) {
+         for (tmp = va; tmp < (va + size); tmp += PAGE_SIZE) {
+             ptep = vtopte(tmp);
+             pte_store(ptep, pte_load(ptep) | PG_N);
+         }
 -        pmap_invalidate_range(kernel_pmap, va, tmp);
++        pmap_invalidate_range(&kernel_pmap, va, tmp);
+     }
+ 
+     return 0;
+ }
+ 
+ static inline void *pmap_mapdev_attr(vm_paddr_t pa, vm_size_t size, int mode)
+ {
+     vm_offset_t tmp, va;
+     uint32_t cache_bits;
+ 
 -    va = kmem_alloc_nofault(kernel_map, size);
++    va = kmem_alloc_nofault(&kernel_map, size);
+     if (va != 0) {
+         cache_bits = (mode != PAT_WRITE_BACK) ? PG_N : 0;
+         for (tmp = va; tmp < (va + size); tmp += PAGE_SIZE) {
+             pt_entry_t *ptep = vtopte(tmp);
+             pte_store(ptep, pa | PG_RW | PG_V | PG_G | cache_bits);
+             pa += PAGE_SIZE;
+         }
 -        pmap_invalidate_range(kernel_pmap, va, tmp);
++        pmap_invalidate_range(&kernel_pmap, va, tmp);
+     }
+ 
+     return (void *)va;
+ }
  #endif
  
+ static inline void pmap_unmapdev_attr(vm_offset_t va, vm_size_t size)
+ {
 -#if __FreeBSD_version < 602110 || __FreeBSD_version >= 700000 && __FreeBSD_version < 700055
++#if defined(__DragonFly__) || \
++      (__FreeBSD_version < 602110 || __FreeBSD_version >= 700000 && __FreeBSD_version < 700055)
+     vm_offset_t tmp;
+ 
+     if (va != 0) {
+         size = NV_ALIGN_UP(size, PAGE_SIZE);
+         for (tmp = va; tmp < (va + size); tmp += PAGE_SIZE)
+             pte_clear(vtopte(tmp));
 -        pmap_invalidate_range(kernel_pmap, va, tmp);
 -        kmem_free(kernel_map, va, size);
++        pmap_invalidate_range(&kernel_pmap, va, tmp);
++        kmem_free(&kernel_map, va, size);
+     }
+ #else
+     pmap_unmapdev(va, size);
+ #endif
+ }
+ 
  /*
   * Entries in the NVIDIA glue-layer registry are now described by the new
   * shared nv_parm_t structure; please review nvidia_os_registry.c in case
@@@ -304,8 -347,9 +396,9 @@@ extern nv_parm_t nv_parms[]
  
  #define __NV_IOC_TYPE(_cmd) (((_cmd) >> 8) & 0xff)
  #define __NV_IOC_NR(_cmd)   (((_cmd) >> 0) & 0xff)
+ #define __NV_IOC_SIZE(_cmd) (((_cmd) >> 16) & 0x1fff)
  
 -extern uma_zone_t nvidia_stack_t_zone;
 +MALLOC_DECLARE(M_NV_STACK);
  
  #define NV_UMA_ZONE_ALLOC_STACK(ptr)                             \
      {                                                            \

diff --cc src/nvidia_ctl.c
index 81ebeee,4183eed..6f492a8
--- 1/src/nvidia_ctl.c
--- 2/src/nvidia_ctl.c
+++ b/src/nvidia_ctl.c
@@@ -76,28 -85,7 +75,7 @@@ int nvidia_ctl_ioctl
          return ENOTTY;
  
      nv_lock_api(nv);
- 
-     sp = sc->api_sp;
- 
-     switch (__NV_IOC_NR(cmd)) {
-         case NV_ESC_CARD_INFO:
-             do {
-                 struct nv_ioctl_card_info *ci = (void *) data;
-                 status = nvidia_get_card_info(ci);
-             } while (0);
-             break;
- 
-         case NV_ESC_CHECK_VERSION_STR:
-             do {
-                 nv_ioctl_rm_api_version_t *params = (void *) data;
-                 status = (rm_perform_version_check(sp, params) == RM_OK) ? 0 : -EINVAL;
-             } while (0);
-             break;
- 
-         default:
-             status = nvidia_handle_ioctl(ap->a_head.a_dev, cmd, data, ap->a_fflag, curthread);
-     }
- 
 -    status = nvidia_handle_ioctl(dev, cmd, data, fflag, td);
++    status = nvidia_handle_ioctl(ap->a_head.a_dev, cmd, data, ap->a_fflag, curthread);
      nv_unlock_api(nv);
  
      return status;

diff --cc src/nvidia_os.c
index e05ce01,5cd495a..e262eea
--- 1/src/nvidia_os.c
--- 2/src/nvidia_os.c
+++ b/src/nvidia_os.c
@@@ -399,10 -351,11 +367,10 @@@ void NV_API_CALL os_dbg_set_level(U032 
      cur_debuglevel = new_debuglevel;
  }
  
- void NV_API_CALL NV_STACKWATCH_CALLBACK os_dbg_breakpoint(void)
+ void NV_API_CALL os_dbg_breakpoint(void)
  {
  #ifdef DEBUG
 -    /* FreeBSD 5.x kdb */
 -    kdb_enter("os_dbg_breakpoint()");
 +    Debugger("nv");
  #endif
  }
  

diff --cc src/nvidia_pci.c
index 015d6fa,aed5ee4..a087b04
--- 1/src/nvidia_pci.c
--- 2/src/nvidia_pci.c
+++ b/src/nvidia_pci.c
@@@ -354,12 -389,14 +391,16 @@@ static driver_t nvidia_pci_driver = 
      sizeof(struct nvidia_softc)
  };
  
+ #if __FreeBSD_version >= 700055
+ DRIVER_MODULE(nvidia, vgapci, nvidia_pci_driver, nvidia_devclass, nvidia_modevent, 0);
+ #else
  DRIVER_MODULE(nvidia, pci, nvidia_pci_driver, nvidia_devclass, nvidia_modevent, 0);
+ #endif
  
 +#if 0
  MODULE_DEPEND(nvidia, mem, 1, 1, 1);
  MODULE_DEPEND(nvidia, io, 1, 1, 1);
 +#endif
  
  #ifdef NV_SUPPORT_OS_AGP
  MODULE_DEPEND(nvidia, agp, 1, 1, 1);

diff --cc src/nvidia_subr.c
index 6d1af9c,a1ad6a4..d9e1889
--- 1/src/nvidia_subr.c
--- 2/src/nvidia_subr.c
+++ b/src/nvidia_subr.c
@@@ -1028,8 -1099,7 +1091,7 @@@ S032 nv_alloc_contig_pages
      if (os_alloc_contig_pages(&address, size) != RM_OK)
          return -ENOMEM;
  
-     /* XXX: Fix me? (cache_type) */
 -    at = malloc(sizeof(struct nvidia_alloc), M_NVIDIA, M_WAITOK | M_ZERO);
 +    at = kmalloc(sizeof(struct nvidia_alloc), M_NVIDIA, M_WAITOK | M_ZERO);
      if (!at) {
          os_free_contig_pages(address, size);
          return -ENOMEM;
@@@ -1079,9 -1160,10 +1152,10 @@@ S032 nv_alloc_system_pages
      struct nvidia_softc *sc = nv->os_state;
      void *address;
      u_int32_t i, size;
+     int status;
  
      size = count * PAGE_SIZE;
 -    at = malloc(sizeof(struct nvidia_alloc), M_NVIDIA, M_WAITOK | M_ZERO);
 +    at = kmalloc(sizeof(struct nvidia_alloc), M_NVIDIA, M_WAITOK | M_ZERO);
      if (!at) {
          return -ENOMEM;
      }
@@@ -1133,9 -1216,14 +1206,12 @@@ S032 nv_free_system_pages
      SLIST_REMOVE(&sc->alloc_list, at, nvidia_alloc, list);
  
      for (i = 0; i < count; i++) {
 -        vm_page_lock_queues();
          vm_page_unwire(PHYS_TO_VM_PAGE(at->pte_array[i]), 0);
 -        vm_page_unlock_queues();
      }
  
+     if (at->cache_type != NV_MEMORY_CACHED)
+         pmap_change_attr(at->address, at->size, PAT_WRITE_BACK);
+ 
      free((void *)at->address, M_NVIDIA);
      free(at, M_NVIDIA);