Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
forked fromtorvalds/linux

Commitca98317

Browse files
committed
drm/i915: Specify which engines to reset following semaphore/event lockups
If the GPU is stuck waiting for an event or for a semaphore, we need toreset the GPU in order to recover. We have to tell the reset routinewhich engines we want reset, but we were still using the old interfaceand declaring it as "not-fatal".Fixes:14b730f ("drm/i915/tdr: Prepare error handler to accept mask of hung engines")Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>Cc: Mika Kuoppala <mika.kuoppala@intel.com>Cc: Michel Thierry <michel.thierry@intel.com>Reviewed-by: Michel Thierry <michel.thierry@intel.com>Link:https://patchwork.freedesktop.org/patch/msgid/20180320100449.1360-1-chris@chris-wilson.co.uk
1 parent03380d1 commitca98317

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

‎drivers/gpu/drm/i915/intel_hangcheck.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ engine_stuck(struct intel_engine_cs *engine, u64 acthd)
246246
*/
247247
tmp=I915_READ_CTL(engine);
248248
if (tmp&RING_WAIT) {
249-
i915_handle_error(dev_priv,0,
249+
i915_handle_error(dev_priv,BIT(engine->id),
250250
"Kicking stuck wait on %s",
251251
engine->name);
252252
I915_WRITE_CTL(engine,tmp);
@@ -258,7 +258,7 @@ engine_stuck(struct intel_engine_cs *engine, u64 acthd)
258258
default:
259259
returnENGINE_DEAD;
260260
case1:
261-
i915_handle_error(dev_priv,0,
261+
i915_handle_error(dev_priv,ALL_ENGINES,
262262
"Kicking stuck semaphore on %s",
263263
engine->name);
264264
I915_WRITE_CTL(engine,tmp);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp