Re: [Intel-gfx] [PATCH] drm/i915: Report an earlier wedged event when suspending the engines

2019-06-06 Thread Mika Kuoppala 
Chris Wilson  writes:

> Quoting Chris Wilson (2019-05-31 12:32:45)
>> 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 

Reviewed-by: Mika Kuoppala 

> ___
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915: Report an earlier wedged event when suspending the engines

2019-06-06 Thread Chris Wilson 
Quoting Chris Wilson (2019-05-31 12:32:45)
> 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 
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH] drm/i915: Report an earlier wedged event when suspending the engines

2019-05-31 Thread Chris Wilson 
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.

Signed-off-by: Chris Wilson 
---
 drivers/gpu/drm/i915/gem/i915_gem_pm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pm.c 
b/drivers/gpu/drm/i915/gem/i915_gem_pm.c
index 11890e96ed65..283d74d9639c 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_pm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_pm.c
@@ -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,
-- 
2.20.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx