msm: display: add display commit ioctl
Display commit ioctl will do what pan_display
can do, addtionally has customized setting, such
as non-blocking call.
Signed-off-by: Ken Zhang <kenz@codeaurora.org>
Signed-off-by: Naseer Ahmed <naseer@codeaurora.org>
diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c
index f5256a3..b60e4970 100644
--- a/drivers/video/msm/msm_fb.c
+++ b/drivers/video/msm/msm_fb.c
@@ -1804,8 +1804,8 @@
}
return ret;
}
-static int msm_fb_pan_display(struct fb_var_screeninfo *var,
- struct fb_info *info)
+static int msm_fb_pan_display_ex(struct fb_var_screeninfo *var,
+ struct fb_info *info, u32 wait_for_finish)
{
struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
struct msm_fb_backup_type *fb_backup;
@@ -1847,9 +1847,17 @@
INIT_COMPLETION(mfd->commit_comp);
schedule_work(&mfd->commit_work);
mutex_unlock(&mfd->sync_mutex);
+ if (wait_for_finish)
+ msm_fb_pan_idle(mfd);
return ret;
}
+static int msm_fb_pan_display(struct fb_var_screeninfo *var,
+ struct fb_info *info)
+{
+ return msm_fb_pan_display_ex(var, info, TRUE);
+}
+
static int msm_fb_pan_display_sub(struct fb_var_screeninfo *var,
struct fb_info *info)
{
@@ -3576,6 +3584,96 @@
mutex_unlock(&mfd->sync_mutex);
return ret;
}
+
+static int buf_fence_process(struct msm_fb_data_type *mfd,
+ struct mdp_buf_fence *buf_fence)
+{
+ int i, fence_cnt = 0, ret;
+ struct sync_fence *fence;
+
+ if ((buf_fence->acq_fen_fd_cnt == 0) ||
+ (buf_fence->acq_fen_fd_cnt > MDP_MAX_FENCE_FD) ||
+ (mfd->timeline == NULL))
+ return -EINVAL;
+
+ mutex_lock(&mfd->sync_mutex);
+ for (i = 0; i < buf_fence->acq_fen_fd_cnt; i++) {
+ fence = sync_fence_fdget(buf_fence->acq_fen_fd[i]);
+ if (fence == NULL) {
+ pr_info("%s: null fence! i=%d fd=%d\n", __func__, i,
+ buf_fence->acq_fen_fd[i]);
+ ret = -EINVAL;
+ break;
+ }
+ mfd->acq_fen[i] = fence;
+ }
+ fence_cnt = i;
+ if (ret)
+ goto buf_fence_err_1;
+ mfd->cur_rel_sync_pt = sw_sync_pt_create(mfd->timeline,
+ mfd->timeline_value + 2);
+ if (mfd->cur_rel_sync_pt == NULL) {
+ pr_err("%s: cannot create sync point", __func__);
+ ret = -ENOMEM;
+ goto buf_fence_err_1;
+ }
+ /* create fence */
+ mfd->cur_rel_fence = sync_fence_create("mdp-fence",
+ mfd->cur_rel_sync_pt);
+ if (mfd->cur_rel_fence == NULL) {
+ sync_pt_free(mfd->cur_rel_sync_pt);
+ mfd->cur_rel_sync_pt = NULL;
+ pr_err("%s: cannot create fence", __func__);
+ ret = -ENOMEM;
+ goto buf_fence_err_1;
+ }
+ /* create fd */
+ mfd->cur_rel_fen_fd = get_unused_fd_flags(0);
+ sync_fence_install(mfd->cur_rel_fence, mfd->cur_rel_fen_fd);
+ buf_fence->rel_fen_fd[0] = mfd->cur_rel_fen_fd;
+ /* Only one released fd for now, -1 indicates an end */
+ buf_fence->rel_fen_fd[1] = -1;
+ mfd->acq_fen_cnt = buf_fence->acq_fen_fd_cnt;
+ mutex_unlock(&mfd->sync_mutex);
+ return ret;
+buf_fence_err_1:
+ for (i = 0; i < fence_cnt; i++)
+ sync_fence_put(mfd->acq_fen[i]);
+ mfd->acq_fen_cnt = 0;
+ mutex_unlock(&mfd->sync_mutex);
+ return ret;
+}
+static int msmfb_display_commit(struct fb_info *info,
+ unsigned long *argp)
+{
+ int ret;
+ u32 copy_back = FALSE;
+ struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
+ struct mdp_display_commit disp_commit;
+ struct mdp_buf_fence *buf_fence;
+ ret = copy_from_user(&disp_commit, argp,
+ sizeof(disp_commit));
+ if (ret) {
+ pr_err("%s:copy_from_user failed", __func__);
+ return ret;
+ }
+ buf_fence = &disp_commit.buf_fence;
+ if (buf_fence->acq_fen_fd_cnt > 0)
+ ret = buf_fence_process(mfd, buf_fence);
+ if ((!ret) && (buf_fence->rel_fen_fd[0] > 0))
+ copy_back = TRUE;
+
+ ret = msm_fb_pan_display_ex(&disp_commit.var,
+ info, disp_commit.wait_for_finish);
+
+ if (copy_back) {
+ ret = copy_to_user(argp,
+ &disp_commit, sizeof(disp_commit));
+ if (ret)
+ pr_err("%s:copy_to_user failed", __func__);
+ }
+ return ret;
+}
static int msm_fb_ioctl(struct fb_info *info, unsigned int cmd,
unsigned long arg)
{
@@ -3891,6 +3989,10 @@
ret = copy_to_user(argp, &buf_sync, sizeof(buf_sync));
break;
+ case MSMFB_DISPLAY_COMMIT:
+ ret = msmfb_display_commit(info, argp);
+ break;
+
default:
MSM_FB_INFO("MDP: unknown ioctl (cmd=%x) received!\n", cmd);
ret = -EINVAL;
diff --git a/include/linux/msm_mdp.h b/include/linux/msm_mdp.h
index 1305fe7..01737da 100644
--- a/include/linux/msm_mdp.h
+++ b/include/linux/msm_mdp.h
@@ -72,6 +72,8 @@
#define MSMFB_VSYNC_CTRL _IOW(MSMFB_IOCTL_MAGIC, 161, unsigned int)
#define MSMFB_BUFFER_SYNC _IOW(MSMFB_IOCTL_MAGIC, 162, struct mdp_buf_sync)
#define MSMFB_OVERLAY_COMMIT _IOW(MSMFB_IOCTL_MAGIC, 163, unsigned int)
+#define MSMFB_DISPLAY_COMMIT _IOW(MSMFB_IOCTL_MAGIC, 164, \
+ struct mdp_display_commit)
#define FB_TYPE_3D_PANEL 0x10101010
#define MDP_IMGTYPE2_START 0x10000
@@ -487,7 +489,7 @@
} data;
};
-#define MDP_MAX_FENCE_FD 4
+#define MDP_MAX_FENCE_FD 10
struct mdp_buf_sync {
uint32_t flags;
@@ -496,6 +498,20 @@
int *rel_fen_fd;
};
+struct mdp_buf_fence {
+ uint32_t flags;
+ uint32_t acq_fen_fd_cnt;
+ int acq_fen_fd[MDP_MAX_FENCE_FD];
+ int rel_fen_fd[MDP_MAX_FENCE_FD];
+};
+
+struct mdp_display_commit {
+ uint32_t flags;
+ uint32_t wait_for_finish;
+ struct fb_var_screeninfo var;
+ struct mdp_buf_fence buf_fence;
+};
+
struct mdp_page_protection {
uint32_t page_protection;
};