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 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@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 12:29:43 -07:00
2019-05-30 11:26:41 -07:00
2019-07-08 15:05:34 +01:00
2019-07-15 19:04:27 -07:00
2019-05-21 10:50:46 +02:00
2019-06-13 13:37:19 +02:00
2019-07-15 19:04:27 -07:00
2019-06-28 14:30:40 +02:00
2019-07-15 19:04:27 -07:00
2019-06-19 12:07:29 +02:00
2019-07-15 19:04:27 -07:00
2019-07-15 19:04:27 -07:00
2019-05-30 11:26:32 -07:00
2019-06-19 12:07:29 +02:00
2019-07-15 19:04:27 -07:00
2019-07-15 19:04:27 -07:00
2019-05-21 10:50:46 +02:00
2019-08-02 21:14:32 +01:00
2019-07-15 19:04:27 -07:00
2019-06-19 13:24:14 +02:00
2019-05-21 20:47:36 +08:00
2019-06-13 11:55:23 +02:00
2019-06-19 12:07:29 +02:00
2019-06-19 12:07:29 +02:00
2019-05-21 10:50:46 +02:00
2019-06-19 12:07:29 +02:00
2019-07-15 19:04:27 -07:00
2019-05-30 11:26:37 -07:00
2019-07-19 12:29:43 -07:00
2019-07-15 19:04:27 -07:00
2019-07-15 19:04:27 -07:00
2019-07-15 19:04:27 -07:00
2019-06-19 17:09:55 +02:00
2019-06-19 12:07:29 +02:00
2019-06-05 20:31:19 +02:00
2019-06-25 08:42:25 -05:00
2019-06-18 11:44:00 -04:00
2019-07-15 19:04:27 -07:00
2019-06-05 20:31:04 +02:00
2019-05-29 11:49:51 -05:00
2019-07-01 09:50:58 +02:00
2019-04-03 11:15:57 +01:00
2019-06-05 20:29:57 +02:00
2019-06-13 17:35:49 +02:00
2019-06-20 17:03:24 +02:00
2019-06-19 12:07:29 +02:00
2019-05-21 10:50:46 +02:00
2019-07-15 19:04:27 -07:00
2019-06-19 17:09:55 +02:00
2019-05-30 11:26:32 -07:00
2019-07-16 04:07:13 +10:00
2019-06-05 17:37:17 +02:00
2019-06-05 17:30:28 +02:00
2019-05-28 08:59:11 +10:00
2019-05-22 16:08:21 -04:00
2019-07-15 19:04:27 -07:00
2019-05-21 10:50:46 +02:00
2019-05-21 10:50:46 +02:00
2019-07-15 19:04:27 -07:00
2019-06-18 22:56:31 -03:00
2019-07-15 19:04:27 -07:00
2019-05-21 10:50:46 +02:00
2019-07-15 19:04:27 -07:00
2019-05-27 18:07:03 +02:00
2019-05-27 18:07:03 +02:00
2019-06-19 12:07:29 +02:00
2019-06-19 12:17:52 +02:00
2019-06-13 14:31:10 -04:00
2019-06-13 14:31:10 -04:00
2019-05-27 18:07:03 +02:00
2019-05-27 18:07:03 +02:00
2019-06-13 13:00:29 -04:00
2019-07-15 19:04:27 -07:00
2019-07-10 12:11:18 +02:00
2019-06-04 12:13:47 +02:00
2019-05-27 18:07:03 +02:00
2019-07-02 15:39:32 +02:00
2019-05-27 18:07:03 +02:00
2019-05-27 18:07:03 +02:00
2019-06-08 16:46:37 +02:00
2019-06-13 16:39:16 +02:00
2019-05-28 09:03:06 +02:00
2019-06-13 16:39:16 +02:00
2019-06-14 16:59:51 +02:00
2019-05-27 18:07:03 +02:00
2019-05-06 16:00:48 +03:00
2019-05-06 16:00:48 +03:00
2019-06-14 19:11:10 +03:00
2019-05-29 20:12:34 +03:00
2019-07-19 10:42:02 -07:00
2019-03-05 13:24:34 -05:00
2019-05-27 18:07:03 +02:00
2019-05-28 09:39:08 +02:00
2019-06-25 14:44:03 +10:00
2019-05-27 18:07:03 +02:00
2019-05-30 11:26:37 -07:00
2019-06-19 12:17:49 +02:00
2019-05-27 18:07:03 +02:00
2019-05-27 18:07:03 +02:00
2019-05-20 13:35:56 +02:00
2019-05-27 18:07:03 +02:00
2019-05-27 18:07:03 +02:00
2019-06-19 12:07:29 +02:00
2019-06-19 12:07:29 +02:00
2019-06-10 09:14:01 -06:00
2019-06-13 13:37:36 +02:00
2019-06-17 17:37:01 +02:00
2019-05-27 18:07:03 +02:00
2019-05-13 22:05:54 +02:00
2019-06-17 17:37:01 +02:00
2019-07-15 19:04:27 -07:00
2019-07-16 12:21:41 -07:00
2019-05-27 18:07:03 +02:00
2019-05-27 18:07:03 +02:00
2019-06-19 12:07:29 +02:00
2019-05-27 18:07:03 +02:00
2019-05-27 18:06:47 +02:00
2019-05-27 18:07:03 +02:00
2019-05-27 18:07:03 +02:00
2019-06-24 05:22:31 +02:00
2019-05-27 18:07:03 +02:00
2019-05-27 18:07:03 +02:00
2019-05-27 18:07:03 +02:00
2019-07-10 12:11:18 +02:00
2019-02-07 21:48:28 +01:00
2019-07-16 12:21:41 -07:00
2019-05-28 09:39:08 +02:00
2019-07-01 16:58:09 +02:00
2019-01-12 13:08:12 +01:00
2019-05-27 18:07:03 +02:00
2019-05-27 18:07:03 +02:00
2019-04-24 11:30:32 +02:00
2019-05-27 18:07:03 +02:00
2019-05-27 18:07:03 +02:00
2019-06-19 12:07:29 +02:00
2019-05-27 18:07:03 +02:00
2019-05-27 18:07:03 +02:00
2019-05-27 18:07:03 +02:00
2019-05-27 18:07:03 +02:00
2019-06-20 10:03:21 -04:00
2019-06-19 12:07:29 +02:00
2019-05-27 18:07:03 +02:00
2019-06-19 12:07:29 +02:00
2019-05-27 18:07:03 +02:00
2019-05-27 18:06:54 +02:00
2019-06-14 19:10:04 +03:00
2019-06-18 15:41:33 -04:00
2019-05-27 18:07:03 +02:00
2019-05-22 12:43:29 +02:00
2019-05-27 18:07:03 +02:00
2019-05-27 18:07:03 +02:00
2019-07-16 12:21:41 -07:00
2019-06-19 13:24:14 +02:00