]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Restore current RPS state after reset
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 21 Sep 2016 13:51:06 +0000 (14:51 +0100)
committerJani Nikula <jani.nikula@intel.com>
Mon, 10 Oct 2016 13:06:35 +0000 (16:06 +0300)
commit7d9f3a69f37333117a528c3977ba928b120570f1
treef4567b4018c86685b1f4652016bc334debe6c1b9
parente019ea7d36d5338a9cc484ac0e9d03c21ac2b521
drm/i915: Restore current RPS state after reset

Following commit de44a5363c60 ("drm/i915: Update reset path to fix
incomplete requests") we no longer mark the context as lost on reset as
we keep the requests (and contexts) alive. However, RPS remains reset
and we need to restore the current state to match the in-flight
requests.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97824
Fixes: de44a5363c60 ("drm/i915: Update reset path to fix incomplete requests")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Arun Siluvery <arun.siluvery@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20160921135108.29574-1-chris@chris-wilson.co.uk
(cherry picked from commit f2a91d1a6f5960c08f1ca60bd076f4dc020c50c6)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_irq.c