| commit | 64e357f9622e67c02a8d66d7d3f8f1001ce07571 | [log] [tgz] |
|---|---|---|
| author | Chris Wilson <[email protected]> | Wed Mar 22 20:59:30 2017 |
| committer | ChromeOS Commit Bot <[email protected]> | Tue Sep 19 03:42:36 2017 |
| tree | b7a954eef7fc56e176bd14abc7369478a6127a30 | |
| parent | 3448c40b1720df605f37348d9b2951976a871280 [diff] |
UPSTREAM: drm/i915: Restore marking context objects as dirty on pinning
Commit e8a9c58fcd9a ("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: e8a9c58fcd9a ("drm/i915: Unify active context tracking between legacy/execlists/guc")
Reported-by: Dennis Gilmore <[email protected]>
Reported-by: Mathieu Marquer <[email protected]>
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 <[email protected]>
Cc: Tvrtko Ursulin <[email protected]>
Cc: <[email protected]> # v4.11-rc1
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by: Tvrtko Ursulin <[email protected]>
(cherry picked from commit 5d4bac5503fcc67dd7999571e243cee49371aef7)
Signed-off-by: Jani Nikula <[email protected]>
BUG=chromium:757641
TEST=Open large text file and GPU heavy webpages on gnawty
Change-Id: I751e9e3594c5e68b654b05de0062e24810436a02
Signed-off-by: Vovo Yang <[email protected]>
Reviewed-on: https://chromium-review.googlesource.com/668339
Commit-Ready: Dominik Behr <[email protected]>
Reviewed-by: Dominik Behr <[email protected]>
Reviewed-by: Stéphane Marchesin <[email protected]>
(cherry picked from commit f7ed2fa88637d1781e0c03c613b386af593b6943)
Reviewed-on: https://chromium-review.googlesource.com/670500