diff options
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 3afe3550e4ae..132ab511b90c 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
| @@ -46,15 +46,16 @@ | |||
| 46 | }) | 46 | }) |
| 47 | 47 | ||
| 48 | #define wait_for_atomic_us(COND, US) ({ \ | 48 | #define wait_for_atomic_us(COND, US) ({ \ |
| 49 | int i, ret__ = -ETIMEDOUT; \ | 49 | unsigned long timeout__ = jiffies + usecs_to_jiffies(US); \ |
| 50 | for (i = 0; i < (US); i++) { \ | 50 | int ret__ = 0; \ |
| 51 | if ((COND)) { \ | 51 | while (!(COND)) { \ |
| 52 | ret__ = 0; \ | 52 | if (time_after(jiffies, timeout__)) { \ |
| 53 | break; \ | 53 | ret__ = -ETIMEDOUT; \ |
| 54 | } \ | 54 | break; \ |
| 55 | udelay(1); \ | 55 | } \ |
| 56 | } \ | 56 | cpu_relax(); \ |
| 57 | ret__; \ | 57 | } \ |
| 58 | ret__; \ | ||
| 58 | }) | 59 | }) |
| 59 | 60 | ||
| 60 | #define wait_for(COND, MS) _wait_for(COND, MS, 1) | 61 | #define wait_for(COND, MS) _wait_for(COND, MS, 1) |