mirror of
https://github.com/torvalds/linux.git
synced 2026-07-31 19:47:08 +02:00
drm/i915: Report an earlier wedged event when suspending the engines
On i915_gem_load_power_context() we do care whether or not we succeed in completing the switch back to the kernel context (via idling the engines). Currently, we detect if an error occurs while we wait, but we do not report one if it occurred beforehand (and the status of the switch is undefined). Check the current terminally wedged status on entering the wait, and report it after flushing the requests, as if it had occurred during our own wait. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110824 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190531113245.30042-1-chris@chris-wilson.co.uk
This commit is contained in:
parent
1fe2d6f94f
commit
ac543d7145
|
|
@ -90,7 +90,7 @@ static int pm_notifier(struct notifier_block *nb,
|
|||
|
||||
static bool switch_to_kernel_context_sync(struct drm_i915_private *i915)
|
||||
{
|
||||
bool result = true;
|
||||
bool result = !i915_terminally_wedged(i915);
|
||||
|
||||
do {
|
||||
if (i915_gem_wait_for_idle(i915,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user