Commit3a088dd

ickle

authored and

rodrigovivi

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(cherry picked from commitca98317)Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

1 parentb1e3144 commit3a088ddCopy full SHA for 3a088dd

File tree

1 file changed

-2

lines changed

drivers/gpu/drm/i915
- intel_hangcheck.c

1 file changed

-2

lines changed

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ engine_stuck(struct intel_engine_cs *engine, u64 acthd)`
`246`	`246`	`*/`
`247`	`247`	`tmp=I915_READ_CTL(engine);`
`248`	`248`	`if (tmp&RING_WAIT) {`
`249`		`-i915_handle_error(dev_priv,0,`
	`249`	`+i915_handle_error(dev_priv,BIT(engine->id),`
`250`	`250`	`"Kicking stuck wait on %s",`
`251`	`251`	`engine->name);`
`252`	`252`	`I915_WRITE_CTL(engine,tmp);`
`@@ -258,7 +258,7 @@ engine_stuck(struct intel_engine_cs *engine, u64 acthd)`
`258`	`258`	`default:`
`259`	`259`	`returnENGINE_DEAD;`
`260`	`260`	`case1:`
`261`		`-i915_handle_error(dev_priv,0,`
	`261`	`+i915_handle_error(dev_priv,ALL_ENGINES,`
`262`	`262`	`"Kicking stuck semaphore on %s",`
`263`	`263`	`engine->name);`
`264`	`264`	`I915_WRITE_CTL(engine,tmp);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit3a088dd

File tree

1 file changed

1 file changed

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

0 commit comments