]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
drm/i915: Squelch any ktime/jiffie rounding errors for wait-ioctl
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 16 Feb 2017 12:54:41 +0000 (12:54 +0000)
committerJani Nikula <jani.nikula@intel.com>
Thu, 9 Mar 2017 08:42:44 +0000 (10:42 +0200)
commit89cf83d4e065ff9fbd2ddc674489c8058eeca758
treefba0a44e7da9598715bcf7b045a087f915e77d92
parent70647f9163aa4fc7090b0d6795d026ebe3897928
drm/i915: Squelch any ktime/jiffie rounding errors for wait-ioctl

We wait upon jiffies, but report the time elapsed using a
high-resolution timer. This discrepancy can lead to us timing out the
wait prior to us reporting the elapsed time as complete.

This restores the squelching lost in commit e95433c73a11 ("drm/i915:
Rearrange i915_wait_request() accounting with callers").

Fixes: e95433c73a11 ("drm/i915: Rearrange i915_wait_request() accounting with callers")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.william.auld@gmail.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: <drm-intel-fixes@lists.freedesktop.org> # v4.10-rc1+
Cc: stable@vger.kernel.org
Link: http://patchwork.freedesktop.org/patch/msgid/20170216125441.30923-1-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
(cherry picked from commit c1d2061b28c2aa25ec39b60d9c248e6beebd7315)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_gem.c