Re: [PATCH 09/21] drm/i915: Make i915_check_and_clear_faults take uncore

Chris Wilson
2019-06-06T09:57:55Z

Quoting Tvrtko Ursulin (2019-06-06 10:36:27)
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> Continuing the conversion and elimination of implicit dev_priv.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Suggested-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +-
> drivers/gpu/drm/i915/i915_drv.c | 2 +-
> drivers/gpu/drm/i915/i915_gem_gtt.c | 34 ++++++++++++-----------
> drivers/gpu/drm/i915/i915_gem_gtt.h | 2 +-
> 4 files changed, 21 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
> index 0e9b74f52503..3554d0dd7b1a 100644
> --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
> +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
> @@ -453,7 +453,7 @@ int intel_engines_init_mmio(struct drm_i915_private *i915)
>
> RUNTIME_INFO(i915)->num_engines = hweight32(mask);
>
> - i915_check_and_clear_faults(i915);
> + i915_check_and_clear_faults(&i915->uncore);

I am not sold on that. Especially as it is then unwrapped back to i915.
-Chris