]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
drm/i915: Remove request->reset_counter
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 29 Jun 2016 14:51:14 +0000 (15:51 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Wed, 29 Jun 2016 16:06:41 +0000 (17:06 +0100)
commit0c5eed651455d0c52b5f6a387fd11b0a690bf24c
tree3b6d0325d6d566c95066848e1e830d0f1365df4e
parent18f4b8435c50888bb36cf8de3b7f0075f00dc12c
drm/i915: Remove request->reset_counter

Since commit 2ed53a94d8cb ("drm/i915: On GPU reset, set the HWS
breadcrumb to the last seqno") once a hang is completed, the seqno is
advanced past all current requests. With this we know that if we wake up
from waiting for a request, if a hang has occurred and reset completed,
our request will be considered complete (i.e.
i915_gem_request_completed() returns true). Therefore we only need to
worry about the situation where a hang has occurred, but not yet reset,
where we may need to release our struct_mutex. Since we don't need to
detect the completed reset using the global gpu_error->reset_counter
anymore, we do not need to track the reset_counter epoch inside the
request.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Arun Siluvery <arun.siluvery@linux.intel.com>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1467211874-11552-1-git-send-email-chris@chris-wilson.co.uk
Reviewed-by: Arun Siluvery <arun.siluvery@linux.intel.com>
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c