Rev 1179 | Rev 1321 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1179 | Rev 1182 | ||
|---|---|---|---|
| Line 205... | Line 205... | ||
| 205 | unsigned long cur_jiffies; |
205 | unsigned long cur_jiffies; |
| 206 | unsigned long timeout; |
206 | unsigned long timeout; |
| 207 | bool expired = false; |
207 | bool expired = false; |
| 208 | int r; |
208 | int r; |
| Line 209... | Line -... | ||
| 209 | - | ||
| 210 | 209 | ||
| 211 | if (fence == NULL) { |
210 | if (fence == NULL) { |
| 212 | WARN(1, "Querying an invalid fence : %p !\n", fence); |
211 | WARN(1, "Querying an invalid fence : %p !\n", fence); |
| 213 | return 0; |
212 | return 0; |
| 214 | } |
213 | } |
| Line 228... | Line 227... | ||
| 228 | cur_jiffies = jiffies; |
227 | cur_jiffies = jiffies; |
| 229 | timeout = HZ / 100; |
228 | timeout = HZ / 100; |
| 230 | if (time_after(fence->timeout, cur_jiffies)) { |
229 | if (time_after(fence->timeout, cur_jiffies)) { |
| 231 | timeout = fence->timeout - cur_jiffies; |
230 | timeout = fence->timeout - cur_jiffies; |
| 232 | } |
231 | } |
| - | 232 | ||
| 233 | if (intr) { |
233 | if (intr) { |
| 234 | r = wait_event_interruptible_timeout(rdev->fence_drv.queue, |
234 | r = wait_event_interruptible_timeout(rdev->fence_drv.queue, |
| 235 | radeon_fence_signaled(fence), timeout); |
235 | radeon_fence_signaled(fence), timeout); |
| 236 | if (unlikely(r == -ERESTARTSYS)) { |
236 | if (unlikely(r == -ERESTARTSYS)) { |
| 237 | return -EBUSY; |
237 | return -EBUSY; |