[Intel-gfx] [PATCH v7 4/6] drm/i915/uc: Move GuC error log to uc and release it on fini
Chris Wilson
chris at chris-wilson.co.uk
Fri Aug 2 19:41:30 UTC 2019
Quoting Michal Wajdeczko (2019-08-02 19:40:53)
> When we fail to load GuC and want to abort probe, we hit:
>
> <7> [229.915779] i915 0000:00:02.0: [drm:intel_uc_init_hw [i915]] GuC initialization failed -6
> <7> [229.915813] i915 0000:00:02.0: [drm:i915_gem_init_hw [i915]] Enabling uc failed (-6)
> <4> [229.953354] ------------[ cut here ]------------
> <4> [229.953355] WARN_ON(dev_priv->mm.shrink_count)
> <4> [229.953406] WARNING: CPU: 9 PID: 3287 at drivers/gpu/drm/i915/i915_gem.c:1684 i915_gem_cleanup_early+0xfc/0x110 [i915]
> <4> [229.953464] Call Trace:
> <4> [229.953489] i915_driver_late_release+0x19/0x60 [i915]
> <4> [229.953514] i915_driver_probe+0xb82/0x18a0 [i915]
> <4> [229.953519] ? __pm_runtime_resume+0x4f/0x80
> <4> [229.953545] i915_pci_probe+0x43/0x1b0 [i915]
> ...
> <4> [229.962951] ------------[ cut here ]------------
> <4> [229.962956] DEBUG_LOCKS_WARN_ON(lock->magic != lock)
> <4> [229.962959] WARNING: CPU: 8 PID: 2395 at kernel/locking/mutex.c:912 __mutex_lock+0x750/0x9b0
> <4> [229.963091] Call Trace:
> <4> [229.963129] ? i915_vma_destroy+0x86/0x350 [i915]
> <4> [229.963166] ? i915_vma_destroy+0x86/0x350 [i915]
> <4> [229.963201] i915_vma_destroy+0x86/0x350 [i915]
> <4> [229.963236] __i915_gem_free_objects+0xb8/0x510 [i915]
> <4> [229.963270] __i915_gem_free_work+0x5a/0x90 [i915]
> <4> [229.963275] process_one_work+0x245/0x610
>
> as since commit 6f76098fe0f3 ("drm/i915/uc: Move uC early functions
> inside the GT ones") we cleanup uc after gem.
>
> Move captured GuC load error log to uc struct and release it
> in intel_uc_fini() instead of intel_uc_driver_late_release()
>
> Note that intel_uc_driver_late_release() is now empty, but
> we can leave it as a placeholder for future code.
>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
Well done, I was looking for an incorrect onion and didn't spot it, so
thought it was just the deferred free.
Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
-Chris
More information about the Intel-gfx
mailing list