evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: mdss: Install sync fences after user copy"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-23 21:35:07 -08:00 • committed by Gerrit - the friendly Code Review server
commit b7ea8035cf
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/video/fbdev/msm/mdss_fb.c
View file

@ -4276,8 +4276,6 @@ static int mdss_fb_handle_buf_sync_ioctl(struct msm_sync_pt_data *sync_pt_data,
goto buf_sync_err_2; goto buf_sync_err_2;
} }
sync_fence_install(rel_fence, rel_fen_fd);
ret = copy_to_user(buf_sync->rel_fen_fd, &rel_fen_fd, sizeof(int)); ret = copy_to_user(buf_sync->rel_fen_fd, &rel_fen_fd, sizeof(int));
if (ret) { if (ret) {
pr_err("%s: copy_to_user failed\n", sync_pt_data->fence_name); pr_err("%s: copy_to_user failed\n", sync_pt_data->fence_name);
@ -4314,8 +4312,6 @@ static int mdss_fb_handle_buf_sync_ioctl(struct msm_sync_pt_data *sync_pt_data,
goto buf_sync_err_3; goto buf_sync_err_3;
} }
sync_fence_install(retire_fence, retire_fen_fd);
ret = copy_to_user(buf_sync->retire_fen_fd, &retire_fen_fd, ret = copy_to_user(buf_sync->retire_fen_fd, &retire_fen_fd,
sizeof(int)); sizeof(int));
if (ret) { if (ret) {
@ -4326,6 +4322,9 @@ static int mdss_fb_handle_buf_sync_ioctl(struct msm_sync_pt_data *sync_pt_data,
goto buf_sync_err_3; goto buf_sync_err_3;
} }
sync_fence_install(rel_fence, rel_fen_fd);
sync_fence_install(retire_fence, retire_fen_fd);
skip_retire_fence: skip_retire_fence:
mutex_unlock(&sync_pt_data->sync_mutex); mutex_unlock(&sync_pt_data->sync_mutex);