[PATCH v7 2/2] Add some debug output

Noralf Trønnes noralf at tronnes.org
Thu May 2 13:40:26 UTC 2019


Does someone call drm_fb_helper_restore_fbdev_mode_unlocked
when there's a master?

Signed-off-by: Noralf Trønnes <noralf at tronnes.org>
---
 drivers/gpu/drm/drm_auth.c      | 2 ++
 drivers/gpu/drm/drm_fb_helper.c | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c
index db199807b7dc..9ae66086cca6 100644
--- a/drivers/gpu/drm/drm_auth.c
+++ b/drivers/gpu/drm/drm_auth.c
@@ -375,6 +375,8 @@ bool drm_master_internal_acquire(struct drm_device *dev)
 	mutex_lock(&dev->master_mutex);
 	if (dev->master) {
 		mutex_unlock(&dev->master_mutex);
+printk("%s: BUSY!!!!\n", __func__);
+dump_stack();
 		return false;
 	}
 
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index ec1de92bfdc6..1d4a094b6adb 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -551,6 +551,8 @@ int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper)
 	bool do_delayed;
 	int ret;
 
+printk("%s\n", __func__);
+dump_stack();
 	if (!drm_fbdev_emulation || !fb_helper)
 		return -ENODEV;
 
@@ -558,6 +560,11 @@ int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper)
 		return 0;
 
 	mutex_lock(&fb_helper->lock);
+if (READ_ONCE(fb_helper->dev->master)) {
+	printk("\n");
+	printk("\n");
+	printk("    THERE IS A MASTER\n");
+}
 	ret = restore_fbdev_mode_force(fb_helper);
 
 	do_delayed = fb_helper->delayed_hotplug;
-- 
2.20.1



More information about the Intel-gfx-trybot mailing list