[Intel-gfx] [CI 19/21] drm/i915: Avoid incrementing hangcheck whilst waiting for external fence

2016-09-09 Thread Chris Wilson 
If we are waiting upon an external fence, from the pov of hangcheck the
engine is stuck on the last submitted seqno. Currently we give a small
increment to the hangcheck score in order to catch a stuck waiter /
driver. Now that we both have an independent wait hangcheck and may be
stuck waiting on an external fence, resetting the GPU has little effect
on that external fence. As we cannot advance by resetting, skip
incrementing the hangcheck score.

Signed-off-by: Chris Wilson 
Cc: Mika Kuoppala 
Reviewed-by: Mika Kuoppala 
---
 drivers/gpu/drm/i915/i915_irq.c | 4 
 1 file changed, 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index b76d45d91a84..8462817a7dae 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -3099,10 +3099,6 @@ static void i915_hangcheck_elapsed(struct work_struct 
*work)
if (engine->hangcheck.seqno == seqno) {
if (i915_seqno_passed(seqno, submit)) {
engine->hangcheck.action = HANGCHECK_IDLE;
-   if (busy) {
-   /* Safeguard against driver failure */
-   engine->hangcheck.score += BUSY;
-   }
} else {
/* We always increment the hangcheck score
 * if the engine is busy and still processing
-- 
2.9.3

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

Re: [Intel-gfx] [CI 19/21] drm/i915: Avoid incrementing hangcheck whilst waiting for external fence

2016-09-09 Thread Mika Kuoppala 
Chris Wilson  writes:

> If we are waiting upon an external fence, from the pov of hangcheck the
> engine is stuck on the last submitted seqno. Currently we give a small
> increment to the hangcheck score in order to catch a stuck waiter /
> driver. Now that we both have an independent wait hangcheck and may be
> stuck waiting on an external fence, resetting the GPU has little effect
> on that external fence. As we cannot advance by resetting, skip
> incrementing the hangcheck score.
>
> Signed-off-by: Chris Wilson 
> Cc: Mika Kuoppala 

Reviewed-by: Mika Kuoppala 

> ---
>  drivers/gpu/drm/i915/i915_irq.c | 4 
>  1 file changed, 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index b76d45d91a84..8462817a7dae 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -3099,10 +3099,6 @@ static void i915_hangcheck_elapsed(struct work_struct 
> *work)
>   if (engine->hangcheck.seqno == seqno) {
>   if (i915_seqno_passed(seqno, submit)) {
>   engine->hangcheck.action = HANGCHECK_IDLE;
> - if (busy) {
> - /* Safeguard against driver failure */
> - engine->hangcheck.score += BUSY;
> - }
>   } else {
>   /* We always increment the hangcheck score
>* if the engine is busy and still processing
> -- 
> 2.9.3
>
> ___
> 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

[Intel-gfx] [CI 19/21] drm/i915: Avoid incrementing hangcheck whilst waiting for external fence

2016-09-09 Thread Chris Wilson 
If we are waiting upon an external fence, from the pov of hangcheck the
engine is stuck on the last submitted seqno. Currently we give a small
increment to the hangcheck score in order to catch a stuck waiter /
driver. Now that we both have an independent wait hangcheck and may be
stuck waiting on an external fence, resetting the GPU has little effect
on that external fence. As we cannot advance by resetting, skip
incrementing the hangcheck score.

Signed-off-by: Chris Wilson 
Cc: Mika Kuoppala 
---
 drivers/gpu/drm/i915/i915_irq.c | 4 
 1 file changed, 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index b76d45d91a84..8462817a7dae 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -3099,10 +3099,6 @@ static void i915_hangcheck_elapsed(struct work_struct 
*work)
if (engine->hangcheck.seqno == seqno) {
if (i915_seqno_passed(seqno, submit)) {
engine->hangcheck.action = HANGCHECK_IDLE;
-   if (busy) {
-   /* Safeguard against driver failure */
-   engine->hangcheck.score += BUSY;
-   }
} else {
/* We always increment the hangcheck score
 * if the engine is busy and still processing
-- 
2.9.3

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

[Intel-gfx] [CI 19/21] drm/i915: Avoid incrementing hangcheck whilst waiting for external fence

2016-09-09 Thread Chris Wilson 
If we are waiting upon an external fence, from the pov of hangcheck the
engine is stuck on the last submitted seqno. Currently we give a small
increment to the hangcheck score in order to catch a stuck waiter /
driver. Now that we both have an independent wait hangcheck and may be
stuck waiting on an external fence, resetting the GPU has little effect
on that external fence. As we cannot advance by resetting, skip
incrementing the hangcheck score.

Signed-off-by: Chris Wilson 
Cc: Mika Kuoppala 
---
 drivers/gpu/drm/i915/i915_irq.c | 4 
 1 file changed, 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index b76d45d91a84..8462817a7dae 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -3099,10 +3099,6 @@ static void i915_hangcheck_elapsed(struct work_struct 
*work)
if (engine->hangcheck.seqno == seqno) {
if (i915_seqno_passed(seqno, submit)) {
engine->hangcheck.action = HANGCHECK_IDLE;
-   if (busy) {
-   /* Safeguard against driver failure */
-   engine->hangcheck.score += BUSY;
-   }
} else {
/* We always increment the hangcheck score
 * if the engine is busy and still processing
-- 
2.9.3

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