[Intel-xe] [CI 17/17] drm/xe: Disable panic_on_warn for testing purposes.
Thomas Hellström
thomas.hellstrom at linux.intel.com
Wed Dec 6 12:58:17 UTC 2023
Turn off panic_on_warn and add some debugging printouts.
Signed-off-by: Thomas Hellström <thomas.hellstrom at linux.intel.com>
---
drivers/gpu/drm/xe/xe_device.c | 3 ++-
drivers/gpu/drm/xe/xe_ttm_sys_mgr.c | 2 ++
drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 3 +++
kernel/panic.c | 1 +
4 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index 8423c817111b..73a99c1a0172 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -191,6 +191,7 @@ static void xe_device_destroy(struct drm_device *dev, void *dummy)
if (xe->unordered_wq)
destroy_workqueue(xe->unordered_wq);
+ pr_info("TTM device fini.\n");
ttm_device_fini(&xe->ttm);
}
@@ -400,7 +401,7 @@ int xe_device_probe(struct xe_device *xe)
u8 id;
xe_pat_init_early(xe);
-
+ panic_on_warn = 0;
xe->info.mem_region_mask = 1;
err = xe_display_init_nommio(xe);
if (err)
diff --git a/drivers/gpu/drm/xe/xe_ttm_sys_mgr.c b/drivers/gpu/drm/xe/xe_ttm_sys_mgr.c
index 3e1fa0c832ca..2183ec7989f9 100644
--- a/drivers/gpu/drm/xe/xe_ttm_sys_mgr.c
+++ b/drivers/gpu/drm/xe/xe_ttm_sys_mgr.c
@@ -88,6 +88,8 @@ static void ttm_sys_mgr_fini(struct drm_device *drm, void *arg)
struct ttm_resource_manager *man = &xe->mem.sys_mgr;
int err;
+ drain_workqueue(xe->ttm.wq);
+ pr_info("TT mgr fini. BO count is %d\n", atomic_read(&ttm_glob.bo_count));
ttm_resource_manager_set_used(man, false);
err = ttm_resource_manager_evict_all(&xe->ttm, man);
diff --git a/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c b/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c
index 953e5dc0fd80..22b6b7897339 100644
--- a/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c
+++ b/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c
@@ -316,6 +316,9 @@ static void ttm_vram_mgr_fini(struct drm_device *dev, void *arg)
struct xe_ttm_vram_mgr *mgr = arg;
struct ttm_resource_manager *man = &mgr->manager;
+ drain_workqueue(xe->ttm.wq);
+ pr_info("VRAM mgr fini. BO count is %d\n", atomic_read(&ttm_glob.bo_count));
+
ttm_resource_manager_set_used(man, false);
if (ttm_resource_manager_evict_all(&xe->ttm, man))
diff --git a/kernel/panic.c b/kernel/panic.c
index bc59531848e4..1c8057027f20 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -59,6 +59,7 @@ static int pause_on_oops_flag;
static DEFINE_SPINLOCK(pause_on_oops_lock);
bool crash_kexec_post_notifiers;
int panic_on_warn __read_mostly;
+EXPORT_SYMBOL_GPL(panic_on_warn);
unsigned long panic_on_taint;
bool panic_on_taint_nousertaint = false;
static unsigned int warn_limit __read_mostly;
--
2.42.0
More information about the Intel-xe
mailing list