All of lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-gfx] [PATCH] drm/i915: fix remaining_timeout in intel_gt_retire_requests_timeout
@ 2022-03-25 17:58 ` Daniele Ceraolo Spurio
  0 siblings, 0 replies; 9+ messages in thread
From: Daniele Ceraolo Spurio @ 2022-03-25 17:58 UTC (permalink / raw)
  To: intel-gfx; +Cc: dri-devel

In intel_gt_wait_for_idle, we use the remaining timeout returned from
intel_gt_retire_requests_timeout to wait on the GuC being idle. However,
the returned variable can have a negative value if something goes wrong
during the wait, leading to us hitting a GEM_BUG_ON in the GuC wait
function.
To fix this, make sure to only return the timeout if it is positive.

Fixes: b97060a99b01b ("drm/i915/guc: Update intel_gt_wait_for_idle to work with GuC")
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: John Harrison <john.c.harrison@intel.com>
---
 drivers/gpu/drm/i915/gt/intel_gt_requests.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_requests.c b/drivers/gpu/drm/i915/gt/intel_gt_requests.c
index edb881d756309..ef70c209976d8 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_requests.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_requests.c
@@ -197,7 +197,7 @@ out_active:	spin_lock(&timelines->lock);
 		active_count++;
 
 	if (remaining_timeout)
-		*remaining_timeout = timeout;
+		*remaining_timeout = timeout > 0 ? timeout : 0;
 
 	return active_count ? timeout : 0;
 }
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2022-03-28  9:16 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-25 17:58 [Intel-gfx] [PATCH] drm/i915: fix remaining_timeout in intel_gt_retire_requests_timeout Daniele Ceraolo Spurio
2022-03-25 17:58 ` Daniele Ceraolo Spurio
2022-03-25 18:29 ` [Intel-gfx] " Matthew Brost
2022-03-25 18:29   ` Matthew Brost
2022-03-25 18:37 ` [Intel-gfx] " Das, Nirmoy
2022-03-25 20:33   ` Ceraolo Spurio, Daniele
2022-03-28  9:16     ` Das, Nirmoy
2022-03-25 19:39 ` [Intel-gfx] ✗ Fi.CI.DOCS: warning for " Patchwork
2022-03-25 20:02 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.