diff options
| author | Chris Wilson | 2018-04-07 00:03:53 +0200 |
|---|---|---|
| committer | Chris Wilson | 2018-04-07 00:43:47 +0200 |
| commit | bba0869b18e44ff2f713c98575ddad8c7c5e9b10 (patch) | |
| tree | 0643eac57745fbd5c143016ec3a395e34b329bfe /drivers/gpu/drm/i915/i915_drv.c | |
| parent | drm/i915: Split out parking from the idle worker for reuse (diff) | |
| download | kernel-qcow2-linux-bba0869b18e44ff2f713c98575ddad8c7c5e9b10.tar.gz kernel-qcow2-linux-bba0869b18e44ff2f713c98575ddad8c7c5e9b10.tar.xz kernel-qcow2-linux-bba0869b18e44ff2f713c98575ddad8c7c5e9b10.zip | |
drm/i915: Treat i915_reset_engine() as guilty until proven innocent
If we are resetting just one engine, we know it has stalled. So we can
pass the stalled parameter directly to i915_gem_reset_engine(), which
alleviates the necessity to poke at the generic engine->hangcheck.stalled
magic variable, leaving that under control of hangcheck as its name
implies. Other than simplifying by removing the indirect parameter along
this path, this allows us to introduce new reset mechanisms that run
independently of hangcheck.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michel Thierry <michel.thierry@intel.com>
Cc: Jeff McGee <jeff.mcgee@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Michel Thierry <michel.thierry@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180406220354.18911-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 684060ed8db6..7ce229c6f424 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -2050,7 +2050,7 @@ int i915_reset_engine(struct intel_engine_cs *engine, const char *msg) * active request and can drop it, adjust head to skip the offending * request to resume executing remaining requests in the queue. */ - i915_gem_reset_engine(engine, active_request); + i915_gem_reset_engine(engine, active_request, true); /* * The engine and its registers (and workarounds in case of render) |