Fix WARN_ON() and fix CUDA 5.0 (NV RM 310.x).

1 files changed, 16 insertions, 48 deletions

diff --git a/litmus/nvidia_info.c b/litmus/nvidia_info.c
index 5a63fb732e8b..ae4ad446408b 100644
--- a/litmus/nvidia_info.c
+++ b/litmus/nvidia_info.c
@@ -49,9 +49,6 @@ typedef struct
     void  *priv;                    /* private data */
     void  *os_state;                /* os-specific device state */
 
-#ifndef CONFIG_CUDA_5_0
-    int    rmInitialized;
-#endif
     int    flags;
 
     /* PCI config info */
@@ -70,12 +67,17 @@ typedef struct
     litmus_nv_aperture_t bars[3];
     litmus_nv_aperture_t *regs;
     litmus_nv_aperture_t *fb, ud;
+
+#ifndef CONFIG_CUDA_5_0
     litmus_nv_aperture_t agp;
+#endif
 
     NvU32  interrupt_line;
 
+#ifndef CONFIG_CUDA_5_0
     NvU32 agp_config;
     NvU32 agp_status;
+#endif
 
     NvU32 primary_vga;
 
@@ -101,8 +103,12 @@ typedef struct litmus_nv_linux_state_s {
     litmus_nv_state_t nv_state;
     atomic_t usage_count;
 
-    struct pci_dev *dev;
+        struct pci_dev *dev;
+
+#ifndef CONFIG_CUDA_5_0
     void *agp_bridge;
+#endif
+
     void *alloc_queue;
 
     void *timer_sp;
@@ -127,19 +133,6 @@ typedef struct litmus_nv_linux_state_s {
     /* lock for linux-specific alloc queue */
     struct semaphore at_lock;
 
-#if 0
-#if defined(NV_USER_MAP)
-    /* list of user mappings */
-    struct nv_usermap_s *usermap_list;
-
-    /* lock for VMware-specific mapping list */
-    struct semaphore mt_lock;
-#endif /* defined(NV_USER_MAP) */
-#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
-        void *apm_nv_dev;
-#endif
-#endif
-
     NvU32 device_num;
     struct litmus_nv_linux_state_s *next;
 } litmus_nv_linux_state_t;
@@ -384,7 +377,7 @@ u32 get_work_nv_device_num(const struct work_struct *t)
 
 
 typedef struct {
-        raw_spinlock_t  lock;  /* not needed if GPU not shared between scheudling domains */
+        raw_spinlock_t  lock;
         struct binheap  owners;
 
 #ifdef CONFIG_LITMUS_SOFTIRQD
@@ -514,7 +507,8 @@ static int init_nv_device_reg(void)
                 INIT_BINHEAP_HANDLE(&NV_DEVICE_REG[i].owners, gpu_owner_max_priority_order);
 
 #ifdef CONFIG_LITMUS_NV_KLMIRQD_DEBUG
-                tasklet_init(&NV_DEVICE_REG[i].nv_klmirqd_dbg_tasklet, nv_klmirqd_dbg_tasklet_func, (unsigned long)&NV_DEVICE_REG[i]);
+                tasklet_init(&NV_DEVICE_REG[i].nv_klmirqd_dbg_tasklet,
+                        nv_klmirqd_dbg_tasklet_func, (unsigned long)&NV_DEVICE_REG[i]);
 #endif
 
 #ifdef CONFIG_LITMUS_SOFTIRQD
@@ -798,8 +792,8 @@ int gpu_owner_increase_priority(struct task_struct *t)
         gpu = find_first_bit(&tsk_rt(t)->held_gpus, sizeof(tsk_rt(t)->held_gpus));
 
         if (!binheap_is_in_heap(&tsk_rt(t)->gpu_owner_node)) {
-                WARN_ON(!is_running(t));
-                TRACE_CUR("gpu klmirqd may not inherit from %s/%d on GPU %d\n",
+                WARN_ON(!is_running(t) && !tsk_rt(t)->hide_from_gpu);
+                TRACE_CUR("nv klmirqd may not inherit from %s/%d on GPU %d\n",
                                   t->comm, t->pid, gpu);
                 goto out;
         }
@@ -848,7 +842,7 @@ int gpu_owner_decrease_priority(struct task_struct *t)
         gpu = find_first_bit(&tsk_rt(t)->held_gpus, sizeof(tsk_rt(t)->held_gpus));
 
         if (!binheap_is_in_heap(&tsk_rt(t)->gpu_owner_node)) {
-                WARN_ON(!is_running(t));
+                WARN_ON(!is_running(t) && !tsk_rt(t)->hide_from_gpu);
                 TRACE_CUR("nv klmirqd may not inherit from %s/%d on GPU %d\n",
                                   t->comm, t->pid, gpu);
                 goto out;
@@ -881,12 +875,6 @@ out:
 
 
 
-
-
-
-
-
-
 static int __reg_nv_device(int reg_device_id, struct task_struct *t)
 {
         __set_bit(reg_device_id, &tsk_rt(t)->held_gpus);
@@ -923,26 +911,6 @@ int reg_nv_device(int reg_device_id, int reg_action, struct task_struct *t)
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 #ifdef CONFIG_LITMUS_PAI_SOFTIRQD
 //void pai_check_priority_increase(struct task_struct *t, int reg_device_id)
 //{