Daniel Vetter
0ba128fa68
Revert "drm: add a locked version of drm_is_current_master" ...
commit f54b3ca7ea1e5e02f481cf4ca54568e57bd66086 upstream.
This reverts commit 1815d9c86e3090477fbde066ff314a7e9721ee0f.
Unfortunately this inverts the locking hierarchy, so back to the
drawing board. Full lockdep splat below:
======================================================
WARNING: possible circular locking dependency detected
5.13.0-rc7-CI-CI_DRM_10254+ #1 Not tainted
------------------------------------------------------
kms_frontbuffer/1087 is trying to acquire lock:
ffff88810dcd01a8 (&dev->master_mutex){+.+.}-{3:3}, at: drm_is_current_master+0x1b/0x40
but task is already holding lock:
ffff88810dcd0488 (&dev->mode_config.mutex){+.+.}-{3:3}, at: drm_mode_getconnector+0x1c6/0x4a0
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #2 (&dev->mode_config.mutex){+.+.}-{3:3}:
__mutex_lock+0xab/0x970
drm_client_modeset_probe+0x22e/0xca0
__drm_fb_helper_initial_config_and_unlock+0x42/0x540
intel_fbdev_initial_config+0xf/0x20 [i915]
async_run_entry_fn+0x28/0x130
process_one_work+0x26d/0x5c0
worker_thread+0x37/0x380
kthread+0x144/0x170
ret_from_fork+0x1f/0x30
-> #1 (&client->modeset_mutex){+.+.}-{3:3}:
__mutex_lock+0xab/0x970
drm_client_modeset_commit_locked+0x1c/0x180
drm_client_modeset_commit+0x1c/0x40
__drm_fb_helper_restore_fbdev_mode_unlocked+0x88/0xb0
drm_fb_helper_set_par+0x34/0x40
intel_fbdev_set_par+0x11/0x40 [i915]
fbcon_init+0x270/0x4f0
visual_init+0xc6/0x130
do_bind_con_driver+0x1e5/0x2d0
do_take_over_console+0x10e/0x180
do_fbcon_takeover+0x53/0xb0
register_framebuffer+0x22d/0x310
__drm_fb_helper_initial_config_and_unlock+0x36c/0x540
intel_fbdev_initial_config+0xf/0x20 [i915]
async_run_entry_fn+0x28/0x130
process_one_work+0x26d/0x5c0
worker_thread+0x37/0x380
kthread+0x144/0x170
ret_from_fork+0x1f/0x30
-> #0 (&dev->master_mutex){+.+.}-{3:3}:
__lock_acquire+0x151e/0x2590
lock_acquire+0xd1/0x3d0
__mutex_lock+0xab/0x970
drm_is_current_master+0x1b/0x40
drm_mode_getconnector+0x37e/0x4a0
drm_ioctl_kernel+0xa8/0xf0
drm_ioctl+0x1e8/0x390
__x64_sys_ioctl+0x6a/0xa0
do_syscall_64+0x39/0xb0
entry_SYSCALL_64_after_hwframe+0x44/0xae
other info that might help us debug this:
Chain exists of: &dev->master_mutex --> &client->modeset_mutex --> &dev->mode_config.mutex
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&dev->mode_config.mutex);
lock(&client->modeset_mutex);
lock(&dev->mode_config.mutex);
lock(&dev->master_mutex);
2021-06-30 08:47:30 -04:00
2021-06-16 12:01:39 +02:00
2021-03-04 11:38:02 +01:00
2021-05-14 09:50:24 +02:00
2021-03-30 14:31:50 +02:00
2021-03-04 11:38:00 +01:00
2021-06-03 09:00:34 +02:00
2021-05-19 10:13:14 +02:00
2021-06-18 10:00:05 +02:00
2021-06-10 13:39:22 +02:00
2021-05-26 12:06:55 +02:00
2021-06-03 09:00:41 +02:00
2021-05-19 10:13:19 +02:00
2021-05-19 10:13:18 +02:00
2021-03-25 09:04:16 +01:00
2021-05-19 10:12:51 +02:00
2021-05-14 09:50:16 +02:00
2021-06-03 09:00:40 +02:00
2021-03-04 11:38:15 +01:00
2021-05-14 09:50:15 +02:00
2021-06-30 08:47:20 -04:00
2021-01-12 20:18:24 +01:00
2021-03-07 12:34:08 +01:00
2021-05-11 14:47:24 +02:00
2021-04-07 15:00:11 +02:00
2021-06-10 13:39:14 +02:00
2021-05-14 09:50:06 +02:00
2021-06-30 08:47:24 -04:00
2021-06-30 08:47:30 -04:00
2021-06-18 10:00:04 +02:00
2021-05-14 09:50:28 +02:00
2021-05-14 09:50:21 +02:00
2021-06-23 14:42:49 +02:00
2021-05-19 10:12:55 +02:00
2021-06-30 08:47:25 -04:00
2021-05-14 09:50:05 +02:00
2021-03-04 11:38:21 +01:00
2021-06-03 09:00:33 +02:00
2021-06-16 12:01:46 +02:00
2021-05-22 11:40:52 +02:00
2021-06-03 09:00:46 +02:00
2021-06-03 09:00:49 +02:00
2021-06-23 14:42:49 +02:00
2021-06-16 12:01:36 +02:00
2021-05-26 12:06:56 +02:00
2021-01-27 11:55:22 +01:00
2021-03-04 11:37:42 +01:00
2021-05-14 09:50:27 +02:00
2021-06-16 12:01:37 +02:00
2021-06-03 09:00:43 +02:00
2021-05-14 09:50:19 +02:00
2021-05-14 09:50:27 +02:00
2021-06-03 09:00:39 +02:00
2021-06-30 08:47:16 -04:00
2021-05-14 09:50:15 +02:00
2021-06-30 08:47:24 -04:00
2021-05-14 09:50:32 +02:00
2021-04-21 13:00:55 +02:00
2021-06-18 10:00:05 +02:00
2021-05-14 09:50:14 +02:00
2021-05-14 09:50:24 +02:00
2021-03-04 11:37:27 +01:00
2021-06-30 08:47:17 -04:00
2021-05-11 14:47:19 +02:00
2021-06-23 14:42:48 +02:00
2021-06-30 08:47:24 -04:00
2021-06-23 14:42:47 +02:00
2021-05-14 09:50:25 +02:00
2021-06-23 14:42:45 +02:00
2021-05-19 10:13:04 +02:00
2021-05-26 12:06:52 +02:00
2021-04-14 08:42:12 +02:00
2021-06-23 14:42:48 +02:00
2021-05-19 10:13:01 +02:00
2021-05-19 10:13:02 +02:00
2021-05-26 12:06:57 +02:00
2021-06-23 14:42:51 +02:00
2021-06-30 08:47:24 -04:00
2021-05-14 09:50:21 +02:00
2021-05-14 09:50:14 +02:00
2021-06-30 08:47:17 -04:00
2021-03-04 11:38:40 +01:00
2021-06-23 14:42:49 +02:00
2021-06-18 10:00:04 +02:00
2021-06-10 13:39:21 +02:00
2021-06-03 09:00:35 +02:00
2021-06-03 09:00:32 +02:00
2021-06-10 13:39:22 +02:00
2021-05-26 12:06:52 +02:00
2021-06-23 14:42:54 +02:00
2021-06-03 09:00:36 +02:00
2021-06-10 13:39:15 +02:00
2021-05-11 14:47:12 +02:00
2021-05-26 12:06:57 +02:00
2021-05-11 14:47:11 +02:00
2021-03-04 11:37:18 +01:00
2021-03-04 11:38:36 +01:00
2021-05-26 12:06:54 +02:00
0ba128fa68