Skip to content

Commit

Permalink
Revert "fbdev: msm: Signal fences in legacy display commit path"
Browse files Browse the repository at this point in the history
This reverts commit c5bb0bd.

The commit leads to freezing the UI, kernel logs states:
[   17.920052] kgsl kgsl-3d0: kgsl: possible gpu syncpoint deadlock for context 4 timestamp 0
[   17.920172] kgsl kgsl-3d0:   context[4]: queue=16896, submit=12672, start=12672, retire=12672
[   17.920269] kgsl kgsl-3d0:   possible deadlock. Context 4 might be blocked for itself
[   17.920319] kgsl kgsl-3d0:   context[4]: submit times: 2.604 2.397 2.486 0.616 1.216 1.844 2.353
[   17.920401] kgsl kgsl-3d0:       pending events:
[   17.920485] kgsl kgsl-3d0:        [0] FENCE mdss mdss_fb_0: 2
[   17.920530] kgsl kgsl-3d0: --gpu syncpoint deadlock print end--

Signed-off-by: Albert I <kras@raphielgang.org>
  • Loading branch information
Quallenauge authored and krasCGQ committed May 18, 2020
1 parent 3de2037 commit 8c2ffc5
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/video/fbdev/msm/mdss_fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Core MDSS framebuffer driver.
*
* Copyright (C) 2007 Google Incorporated
* Copyright (c) 2008-2020, The Linux Foundation. All rights reserved.
* Copyright (c) 2008-2019, The Linux Foundation. All rights reserved.
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
Expand Down Expand Up @@ -3336,7 +3336,6 @@ static int mdss_fb_pan_display_ex(struct fb_info *info,
mfd->msm_fb_backup.info = *info;
mfd->msm_fb_backup.disp_commit = *disp_commit;

atomic_inc(&mfd->mdp_sync_pt_data.commit_cnt);
atomic_inc(&mfd->commits_pending);
atomic_inc(&mfd->kickoff_pending);
wake_up_all(&mfd->commit_wait_q);
Expand Down Expand Up @@ -4440,7 +4439,7 @@ static int mdss_fb_handle_buf_sync_ioctl(struct msm_sync_pt_data *sync_pt_data,
if (IS_ERR_OR_NULL(retire_fence)) {
val += sync_pt_data->retire_threshold;
retire_fence = mdss_fb_sync_get_fence(
sync_pt_data->timeline_retire, "mdp-retire", val);
sync_pt_data->timeline, "mdp-retire", val);
}

if (IS_ERR_OR_NULL(retire_fence)) {
Expand Down

0 comments on commit 8c2ffc5

Please sign in to comment.