Michal Wajdeczko
32ff76e80c
drm/i915/uc: Move GuC error log to uc and release it on fini
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 6f76098fe0 ("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@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190802184055.31988-5-michal.wajdeczko@intel.com
2019-08-02 21:14:32 +01:00
..
2019-07-19 09:45:58 -07:00
2019-07-12 12:24:03 -07:00
2019-07-09 10:59:26 -07:00
2019-07-15 11:06:27 -07:00
2019-07-09 12:34:26 -07:00
2019-07-19 10:42:02 -07:00
2019-07-18 11:05:25 -07:00
2019-07-06 21:44:25 +02:00
2019-07-19 17:13:56 -07:00
2019-07-15 11:03:02 -03:00
2019-07-17 10:07:48 -07:00
2019-07-10 11:05:26 +02:00
2019-07-11 15:36:02 -07:00
2019-07-18 09:49:30 +02:00
2019-07-18 09:49:30 +02:00
2019-07-19 12:23:37 -07:00
2019-07-19 10:42:02 -07:00
2019-07-17 09:55:43 -07:00
2019-07-19 10:42:02 -07:00
2019-06-27 10:24:47 -07:00
2019-07-19 17:13:56 -07:00
2019-07-16 19:23:25 -07:00
2019-07-17 13:05:21 -07:00
2019-08-02 21:14:32 +01:00
2019-07-15 09:42:32 -07:00
2019-07-18 17:08:07 -07:00
2019-07-19 17:13:56 -07:00
2019-06-29 21:08:14 -07:00
2019-07-12 14:42:05 -07:00
2019-07-15 21:10:39 -07:00
2019-07-09 09:04:31 -07:00
2019-07-09 12:34:26 -07:00
2019-07-12 12:24:03 -07:00
2019-07-20 10:04:58 -07:00
2019-07-20 12:22:30 -07:00
2019-07-21 09:57:13 -07:00
2019-07-11 15:38:21 -07:00
2019-07-10 11:04:17 +02:00
2019-07-15 11:10:31 -07:00
2019-07-09 08:59:39 -07:00
2019-07-13 16:08:36 -07:00
2019-07-14 16:36:51 -07:00
2019-07-18 14:49:33 -07:00
2019-07-11 10:55:49 -07:00
2019-07-20 09:34:55 -07:00
2019-07-11 18:11:21 -07:00
2019-07-11 15:14:01 -07:00
2019-07-15 20:18:40 -07:00
2019-07-19 10:42:02 -07:00
2019-07-11 18:11:21 -07:00
2019-07-15 09:20:28 -03:00
2019-07-19 10:06:06 -07:00
2019-07-02 12:00:50 -07:00
2019-07-21 09:46:59 -07:00
2019-07-19 09:45:58 -07:00
2019-07-15 21:20:52 -07:00
2019-07-12 12:24:03 -07:00
2019-07-17 11:26:09 -07:00
2019-07-15 20:44:49 -07:00
2019-07-04 22:01:59 -04:00
2019-07-09 12:34:26 -07:00
2019-07-21 09:46:59 -07:00
2019-07-09 12:34:26 -07:00
2019-07-15 09:20:27 -03:00
2019-07-01 15:04:59 +02:00
2019-07-13 15:02:27 -07:00
2019-07-17 19:07:58 +03:00
2019-07-15 11:03:02 -03:00
2019-07-15 21:06:15 -07:00
2019-07-11 15:08:58 +02:00
2019-07-16 19:23:24 -07:00
2019-07-09 08:57:45 -07:00
2019-07-17 08:58:04 -07:00
2019-07-15 20:18:40 -07:00
2019-07-17 11:44:41 -07:00
2019-07-19 17:13:56 -07:00
2019-07-17 10:03:50 -07:00
2019-07-20 10:04:58 -07:00
2019-07-20 10:04:58 -07:00
2019-07-19 17:19:24 -07:00
2019-07-05 08:15:08 +02:00
2019-07-12 12:24:03 -07:00
2019-07-16 12:21:41 -07:00
2019-07-11 15:14:01 -07:00
2019-07-18 09:32:28 -07:00
2019-07-12 12:24:03 -07:00
2019-07-19 17:05:08 -07:00
2019-07-19 10:42:02 -07:00
2019-07-17 11:23:13 -07:00
2019-07-17 11:26:09 -07:00
2019-07-16 09:25:04 -07:00
2019-07-19 10:42:02 -07:00
2019-07-15 11:03:02 -03:00
2019-07-15 08:49:11 +02:00
2019-07-19 11:41:26 -07:00