Skip to content

Commit 14d9a37

Browse files
fabioestevamdanvet
authored andcommitted
Revert "drm/imx: Annotate dma-fence critical section in commit path"
This reverts commit f4b34fa. Since commit f4b34fa ("drm/imx: Annotate dma-fence critical section in commit path") the following possible circular dependency is detected: [ 5.001811] ====================================================== [ 5.001817] WARNING: possible circular locking dependency detected [ 5.001824] 5.14.9-01225-g45da36cc6fcc-dirty #1 Tainted: G W [ 5.001833] ------------------------------------------------------ [ 5.001838] kworker/u8:0/7 is trying to acquire lock: [ 5.001848] c1752080 (regulator_list_mutex){+.+.}-{3:3}, at: regulator_lock_dependent+0x40/0x294 [ 5.001903] [ 5.001903] but task is already holding lock: [ 5.001909] c176df78 (dma_fence_map){++++}-{0:0}, at: imx_drm_atomic_commit_tail+0x10/0x160 [ 5.001957] [ 5.001957] which lock already depends on the new lock. ... Revert it for now. Tested on a imx6q-sabresd. Fixes: f4b34fa ("drm/imx: Annotate dma-fence critical section in commit path") Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 9d6366e commit 14d9a37

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

drivers/gpu/drm/imx/imx-drm-core.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ static void imx_drm_atomic_commit_tail(struct drm_atomic_state *state)
8181
struct drm_plane_state *old_plane_state, *new_plane_state;
8282
bool plane_disabling = false;
8383
int i;
84-
bool fence_cookie = dma_fence_begin_signalling();
8584

8685
drm_atomic_helper_commit_modeset_disables(dev, state);
8786

@@ -112,7 +111,6 @@ static void imx_drm_atomic_commit_tail(struct drm_atomic_state *state)
112111
}
113112

114113
drm_atomic_helper_commit_hw_done(state);
115-
dma_fence_end_signalling(fence_cookie);
116114
}
117115

118116
static const struct drm_mode_config_helper_funcs imx_drm_mode_config_helpers = {

0 commit comments

Comments
 (0)