]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Restore marking context objects as dirty on pinning
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 22 Mar 2017 20:59:30 +0000 (20:59 +0000)
committerJani Nikula <jani.nikula@intel.com>
Mon, 27 Mar 2017 08:56:27 +0000 (11:56 +0300)
commitfd625c076370dde6254c862f43d6c577fce8b2e2
treead6d5858edf0f2a631481ab0110b925128c4070e
parent4152be156dd40669d6a44d25d68e7caa95f34b4d
drm/i915: Restore marking context objects as dirty on pinning

Commit 1d7c7389fc2e ("drm/i915: Unify active context tracking between
legacy/execlists/guc") converted the legacy intel_ringbuffer submission
to the same context pinning mechanism as execlists - that is to pin the
context until the subsequent request is retired. Previously it used the
vma retirement of the context object to keep itself pinned until the
next request (after i915_vma_move_to_active()). In the conversion, I
missed that the vma retirement was also responsible for marking the
object as dirty. Mark the context object as dirty when pinning
(equivalent to execlists) which ensures that if the context is swapped
out due to mempressure or suspend/hibernation, when it is loaded back in
it does so with the previous state (and not all zero).

Fixes: 1d7c7389fc2e ("drm/i915: Unify active context tracking between legacy/execlists/guc")
Reported-by: Dennis Gilmore <dennis@ausil.us>
Reported-by: Mathieu Marquer <mathieu.marquer@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99993
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100181
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: <drm-intel-fixes@lists.freedesktop.org> # v4.11-rc1
Link: http://patchwork.freedesktop.org/patch/msgid/20170322205930.12762-1-chris@chris-wilson.co.uk
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
(cherry picked from commit 5d4bac5503fcc67dd7999571e243cee49371aef7)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_ringbuffer.c