drm/i915: Add wait_for_us
This is for callers who want micro-second precision but are not waiting from the atomic context. v2: * Fix atomic waits. (Dave Gordon) * Use USEC_PER_SEC and USEC_PER_MSEC. (Chris Wilson) Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Dave Gordon <david.s.gordon@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
@@ -45,8 +45,8 @@
|
||||
* having timed out, since the timeout could be due to preemption or similar and
|
||||
* we've never had a chance to check the condition before the timeout.
|
||||
*/
|
||||
#define _wait_for(COND, MS, W) ({ \
|
||||
unsigned long timeout__ = jiffies + msecs_to_jiffies(MS) + 1; \
|
||||
#define _wait_for(COND, US, W) ({ \
|
||||
unsigned long timeout__ = jiffies + usecs_to_jiffies(US) + 1; \
|
||||
int ret__ = 0; \
|
||||
while (!(COND)) { \
|
||||
if (time_after(jiffies, timeout__)) { \
|
||||
@@ -55,7 +55,7 @@
|
||||
break; \
|
||||
} \
|
||||
if ((W) && drm_can_sleep()) { \
|
||||
usleep_range((W)*1000, (W)*2000); \
|
||||
usleep_range((W), (W)*2); \
|
||||
} else { \
|
||||
cpu_relax(); \
|
||||
} \
|
||||
@@ -63,10 +63,11 @@
|
||||
ret__; \
|
||||
})
|
||||
|
||||
#define wait_for(COND, MS) _wait_for(COND, MS, 1)
|
||||
#define wait_for_atomic(COND, MS) _wait_for(COND, MS, 0)
|
||||
#define wait_for_atomic_us(COND, US) _wait_for((COND), \
|
||||
DIV_ROUND_UP((US), 1000), 0)
|
||||
#define wait_for(COND, MS) _wait_for((COND), (MS) * 1000, 1000)
|
||||
#define wait_for_us(COND, US) _wait_for((COND), (US), 1)
|
||||
|
||||
#define wait_for_atomic(COND, MS) _wait_for((COND), (MS) * 1000, 0)
|
||||
#define wait_for_atomic_us(COND, US) _wait_for((COND), (US), 0)
|
||||
|
||||
#define KHz(x) (1000 * (x))
|
||||
#define MHz(x) KHz(1000 * (x))
|
||||
|
Reference in New Issue
Block a user