Commit b90f5176 authored Feb 18, 2013 by Paulo Zanoni Committed by Daniel Vetter Feb 20, 2013

drm/i915: wait_event_timeout's timeout is in jiffies



So use msecs_to_jiffies(10) to make the timeout the same as in the
"!has_aux_irq" case.

This patch was initially written by Daniel Vetter and posted on
pastebin a few weeks ago. I'm just bringing it to the mailing list.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 22b8bf17

drivers/gpu/drm/i915/intel_dp.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -353,7 +353,8 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp, bool has_aux_irq)

		#define C (((status = I915_READ_NOTRACE(ch_ctl)) & DP_AUX_CH_CTL_SEND_BUSY) == 0)
		if (has_aux_irq)
		done = wait_event_timeout(dev_priv->gmbus_wait_queue, C, 10);
		done = wait_event_timeout(dev_priv->gmbus_wait_queue, C,
		msecs_to_jiffies(10));
		else
		done = wait_for_atomic(C, 10) == 0;
		if (!done)