OSDN Git Service

drm/i915: Make WAIT_IOCTL negative timeouts be indefinite again
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 4 Mar 2015 18:09:26 +0000 (18:09 +0000)
committerJani Nikula <jani.nikula@intel.com>
Tue, 10 Mar 2015 09:55:03 +0000 (11:55 +0200)
commit762e45836a047323defe9bdbbac534f0675ff027
treebb5ad0ebce84b31bcf9febcbc1a73af3d5e42e64
parent6c51d46f135b00c00373fcd029786ccef2b02b5b
drm/i915: Make WAIT_IOCTL negative timeouts be indefinite again

This fixes a regression from

commit 5ed0bdf21a85d78e04f89f15ccf227562177cbd9
Author: Thomas Gleixner <tglx@linutronix.de>
Date:   Wed Jul 16 21:05:06 2014 +0000

    drm: i915: Use nsec based interfaces

that made a negative timeout return immediately rather than the
previously defined behaviour of waiting indefinitely.

Testcase: igt/gem_wait
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89494
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ben Widawsky <benjamin.widawsky@intel.com>
Cc: Kristian Høgsberg <krh@bitplanet.net>
Cc: stable@vger.kernel.org
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
[Jani: fixed a checkpatch complaint about whitespace.]
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_gem.c