Rev 4569 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4569 | Rev 5078 | ||
---|---|---|---|
Line 126... | Line 126... | ||
126 | struct vmw_fifo_state *fifo_state = &dev_priv->fifo; |
126 | struct vmw_fifo_state *fifo_state = &dev_priv->fifo; |
Line 127... | Line 127... | ||
127 | 127 | ||
128 | uint32_t count = 0; |
128 | uint32_t count = 0; |
129 | uint32_t signal_seq; |
129 | uint32_t signal_seq; |
130 | int ret; |
130 | int ret; |
131 | unsigned long end_jiffies = GetTimerTicks() + timeout; |
131 | unsigned long end_jiffies = jiffies + timeout; |
132 | bool (*wait_condition)(struct vmw_private *, uint32_t); |
132 | bool (*wait_condition)(struct vmw_private *, uint32_t); |
Line 133... | Line 133... | ||
133 | DEFINE_WAIT(__wait); |
133 | DEFINE_WAIT(__wait); |
134 | 134 | ||
Line 148... | Line 148... | ||
148 | // prepare_to_wait(&dev_priv->fence_queue, &__wait, |
148 | // prepare_to_wait(&dev_priv->fence_queue, &__wait, |
149 | // (interruptible) ? |
149 | // (interruptible) ? |
150 | // TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE); |
150 | // TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE); |
151 | if (wait_condition(dev_priv, seqno)) |
151 | if (wait_condition(dev_priv, seqno)) |
152 | break; |
152 | break; |
153 | if (time_after_eq(GetTimerTicks(), end_jiffies)) { |
153 | if (time_after_eq(jiffies, end_jiffies)) { |
154 | DRM_ERROR("SVGA device lockup.\n"); |
154 | DRM_ERROR("SVGA device lockup.\n"); |
155 | break; |
155 | break; |
156 | } |
156 | } |
157 | if (lazy) |
157 | if (lazy) |
158 | delay(1); |
158 | delay(1); |