Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dea83ed7 authored by Veera Sundaram Sankaran's avatar Veera Sundaram Sankaran
Browse files

msm: mdss: cleanup obsolete ioctls from mdss 



Remove few ioctls and changes related to it as they are obsolete now.

Change-Id: I26ad6609f8a1b3b2f8f549b82c330e5db7e5b44c
Signed-off-by: default avatarVeera Sundaram Sankaran <veeras@codeaurora.org>
parent cee69e17

drivers/video/msm/mdss/mdss_compat_utils.c

+0 −8
Original line number Diff line number Diff line
@@ -3629,12 +3629,8 @@ int mdss_compat_overlay_ioctl(struct fb_info *info, unsigned int cmd, 
		}

		break;

	case MSMFB_OVERLAY_UNSET:

	case MSMFB_OVERLAY_PLAY_ENABLE:

	case MSMFB_OVERLAY_PLAY:

	case MSMFB_OVERLAY_PLAY_WAIT:

	case MSMFB_VSYNC_CTRL:

	case MSMFB_OVERLAY_VSYNC_CTRL:

	case MSMFB_OVERLAY_COMMIT:

	case MSMFB_METADATA_SET:

	case MSMFB_METADATA_GET:

	default:
@@ -3684,12 +3680,8 @@ int mdss_fb_compat_ioctl(struct fb_info *info, unsigned int cmd, 
	case MSMFB_OVERLAY_GET:

	case MSMFB_OVERLAY_SET:

	case MSMFB_OVERLAY_UNSET:

	case MSMFB_OVERLAY_PLAY_ENABLE:

	case MSMFB_OVERLAY_PLAY:

	case MSMFB_OVERLAY_PLAY_WAIT:

	case MSMFB_VSYNC_CTRL:

	case MSMFB_OVERLAY_VSYNC_CTRL:

	case MSMFB_OVERLAY_COMMIT:

	case MSMFB_METADATA_SET:

	case MSMFB_METADATA_GET:

	case MSMFB_OVERLAY_PREPARE:

drivers/video/msm/mdss/mdss_fb.c

+0 −10
Original line number Diff line number Diff line
@@ -3944,7 +3944,6 @@ int mdss_fb_do_ioctl(struct fb_info *info, unsigned int cmd, 
{

	struct msm_fb_data_type *mfd;

	void __user *argp = (void __user *)arg;

	struct mdp_page_protection fb_page_protection;

	int ret = -ENOSYS;

	struct mdp_buf_sync buf_sync;

	struct msm_sync_pt_data *sync_pt_data = NULL;
@@ -3984,15 +3983,6 @@ int mdss_fb_do_ioctl(struct fb_info *info, unsigned int cmd, 
		ret = mdss_fb_set_lut(info, argp);

		break;



	case MSMFB_GET_PAGE_PROTECTION:

		fb_page_protection.page_protection =

			mfd->mdp_fb_page_protection;

		ret = copy_to_user(argp, &fb_page_protection,

				   sizeof(fb_page_protection));

		if (ret)

			goto exit;

		break;



	case MSMFB_BUFFER_SYNC:

		ret = copy_from_user(&buf_sync, argp, sizeof(buf_sync));

		if (ret)

drivers/video/msm/mdss/mdss_mdp.h

+0 −1
Original line number Diff line number Diff line
@@ -565,7 +565,6 @@ struct mdss_overlay_private { 
	struct kernfs_node *ad_event_sd;

	struct kernfs_node *ad_bl_event_sd;

	int borderfill_enable;

	int overlay_play_enable;

	int hw_refresh;

	void *cpu_pm_hdl;

drivers/video/msm/mdss/mdss_mdp_overlay.c

+10 −59
Original line number Diff line number Diff line
@@ -2114,21 +2114,6 @@ static int __mdss_mdp_overlay_release_all(struct msm_fb_data_type *mfd, 
	return cnt;

}



static int mdss_mdp_overlay_play_wait(struct msm_fb_data_type *mfd,

				      struct msmfb_overlay_data *req)

{

	int ret = 0;



	if (!mfd)

		return -ENODEV;



	ret = mfd->mdp.kickoff_fnc(mfd, NULL);

	if (!ret)

		pr_err("error displaying\n");



	return ret;

}



static int mdss_mdp_overlay_queue(struct msm_fb_data_type *mfd,

				  struct msmfb_overlay_data *req)

{
@@ -4124,11 +4109,11 @@ validate_exit: 
static int mdss_mdp_overlay_ioctl_handler(struct msm_fb_data_type *mfd,

					  u32 cmd, void __user *argp)

{

	struct mdss_overlay_private *mdp5_data = mfd_to_mdp5_data(mfd);

	struct mdp_overlay *req = NULL;

	int val, ret = -ENOSYS;

	struct msmfb_metadata metadata;

	struct mdp_pp_feature_version pp_feature_version;

	struct msmfb_overlay_data data;



	switch (cmd) {

	case MSMFB_MDP_PP:
@@ -4191,53 +4176,20 @@ static int mdss_mdp_overlay_ioctl_handler(struct msm_fb_data_type *mfd, 
			pr_debug("OVERLAY_SET failed (%d)\n", ret);

		break;





	case MSMFB_OVERLAY_UNSET:

		if (!IS_ERR_VALUE(copy_from_user(&val, argp, sizeof(val))))

			ret = mdss_mdp_overlay_unset(mfd, val);

		break;



	case MSMFB_OVERLAY_PLAY_ENABLE:

		if (!copy_from_user(&val, argp, sizeof(val))) {

			mdp5_data->overlay_play_enable = val;

			ret = 0;

		} else {

			pr_err("OVERLAY_PLAY_ENABLE failed (%d)\n", ret);

			ret = -EFAULT;

		}

		break;



	case MSMFB_OVERLAY_PLAY:

		if (mdp5_data->overlay_play_enable) {

			struct msmfb_overlay_data data;



		ret = copy_from_user(&data, argp, sizeof(data));

		if (!ret)

			ret = mdss_mdp_overlay_play(mfd, &data);



		if (ret)

			pr_debug("OVERLAY_PLAY failed (%d)\n", ret);

		} else {

			ret = 0;

		}

		break;



	case MSMFB_OVERLAY_PLAY_WAIT:

		if (mdp5_data->overlay_play_enable) {

			struct msmfb_overlay_data data;



			ret = copy_from_user(&data, argp, sizeof(data));

			if (!ret)

				ret = mdss_mdp_overlay_play_wait(mfd, &data);



			if (ret)

				pr_err("OVERLAY_PLAY_WAIT failed (%d)\n", ret);

		} else {

			ret = 0;

		}

		break;



	case MSMFB_VSYNC_CTRL:

	case MSMFB_OVERLAY_VSYNC_CTRL:

		if (!copy_from_user(&val, argp, sizeof(val))) {

			ret = mdss_mdp_overlay_vsync_ctrl(mfd, val);
@@ -4246,16 +4198,14 @@ static int mdss_mdp_overlay_ioctl_handler(struct msm_fb_data_type *mfd, 
			ret = -EFAULT;

		}

		break;

	case MSMFB_OVERLAY_COMMIT:

		mdss_fb_wait_for_fence(&(mfd->mdp_sync_pt_data));

		ret = mfd->mdp.kickoff_fnc(mfd, NULL);

		break;



	case MSMFB_METADATA_SET:

		ret = copy_from_user(&metadata, argp, sizeof(metadata));

		if (ret)

			return ret;

		ret = mdss_fb_set_metadata(mfd, &metadata);

		break;



	case MSMFB_METADATA_GET:

		ret = copy_from_user(&metadata, argp, sizeof(metadata));

		if (ret)
@@ -4264,9 +4214,11 @@ static int mdss_mdp_overlay_ioctl_handler(struct msm_fb_data_type *mfd, 
		if (!ret)

			ret = copy_to_user(argp, &metadata, sizeof(metadata));

		break;



	case MSMFB_OVERLAY_PREPARE:

		ret = __handle_ioctl_overlay_prepare(mfd, argp);

		break;



	default:

		break;

	}
@@ -4875,7 +4827,6 @@ int mdss_mdp_overlay_init(struct msm_fb_data_type *mfd) 
	mutex_init(&mdp5_data->ov_lock);

	mutex_init(&mdp5_data->dfps_lock);

	mdp5_data->hw_refresh = true;

	mdp5_data->overlay_play_enable = true;

	mdp5_data->cursor_ndx[CURSOR_PIPE_LEFT] = MSMFB_NEW_REQUEST;

	mdp5_data->cursor_ndx[CURSOR_PIPE_RIGHT] = MSMFB_NEW_REQUEST;