From: Ben Widawsky <ben@bwidawsk.net>
Date: Sun, 2 Sep 2012 05:59:49 +0000 (-0700)
Subject: drm/i915: Change forcewake timeout to 2ms
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~20^2~15^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=057d3860613813b2e8507bb932f9a523ad2cca2f;p=pandora-kernel.git

drm/i915: Change forcewake timeout to 2ms

A designer familiar with the hardware has stated that the forcewake
timeout can theoretically be as high as a little over 1ms. Therefore we
modify our code to use 2ms (appropriate fudge and because we don't want
to round down).

Hopefully this can't prevent spurious timeouts.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Acked-by: Chris Wilson <chris@chris-wilson.oc.uk>
[danvet: again fix conflict with vlv patch.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

Reading git-diff-tree failed