Commit f736ae1b authored by Tvrtko Ursulin's avatar Tvrtko Ursulin

drm/i915: Extract engine fault reset to a helper

Just tidying the flow a bit.
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190607082557.31670-4-tvrtko.ursulin@linux.intel.com
parent 77a302e0
...@@ -1160,6 +1160,12 @@ static void clear_register(struct intel_uncore *uncore, i915_reg_t reg) ...@@ -1160,6 +1160,12 @@ static void clear_register(struct intel_uncore *uncore, i915_reg_t reg)
intel_uncore_rmw(uncore, reg, 0, 0); intel_uncore_rmw(uncore, reg, 0, 0);
} }
static void gen8_clear_engine_error_register(struct intel_engine_cs *engine)
{
GEN6_RING_FAULT_REG_RMW(engine, RING_FAULT_VALID, 0);
GEN6_RING_FAULT_REG_POSTING_READ(engine);
}
void i915_clear_error_registers(struct drm_i915_private *i915, void i915_clear_error_registers(struct drm_i915_private *i915,
intel_engine_mask_t engine_mask) intel_engine_mask_t engine_mask)
{ {
...@@ -1194,10 +1200,8 @@ void i915_clear_error_registers(struct drm_i915_private *i915, ...@@ -1194,10 +1200,8 @@ void i915_clear_error_registers(struct drm_i915_private *i915,
struct intel_engine_cs *engine; struct intel_engine_cs *engine;
enum intel_engine_id id; enum intel_engine_id id;
for_each_engine_masked(engine, i915, engine_mask, id) { for_each_engine_masked(engine, i915, engine_mask, id)
GEN6_RING_FAULT_REG_RMW(engine, RING_FAULT_VALID, 0); gen8_clear_engine_error_register(engine);
GEN6_RING_FAULT_REG_POSTING_READ(engine);
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment