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

msm: mdss: compat ioctl support for sspp features

Browse source 
Source surface post processing(sspp) pipes support post processing
features in thulium. If user-space client is 32 bit and kernel is 64
bit compat ioctl path will be taken. Change updates the driver in
compat path to support 32 bit clients for sspp features.

Change-Id: Iaa07f40520f115348ac3af4c9eeb5690ed78e2dd
Signed-off-by: Gopikrishnaiah Anandan <agopik@codeaurora.org>
This commit is contained in:
Gopikrishnaiah Anandan 2015-01-21 16:04:02 -08:00 • committed by David Keitel
parent e5d47202fb
commit d30780ae2b
2 changed files with 44 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
drivers/video/fbdev/msm/mdss_compat_utils.c
View file

@ -3355,6 +3355,33 @@ void mdss_compat_align_list(void __user *total_mem_chunk,
list_ptr[i] = contig_overlays + i;
}
static u32 __pp_sspp_size(void)
{
u32 size = 0;
/* pick the largest of the revision when multiple revs are supported */
size = sizeof(struct mdp_igc_lut_data_v1_7);
size += sizeof(struct mdp_pa_data_v1_7);
size += sizeof(struct mdp_pcc_data_v1_7);
return size;
}
static int __pp_sspp_set_offsets(struct mdp_overlay *ov)
{
if (!ov) {
pr_err("invalid overlay pointer\n");
return -EFAULT;
}
ov->overlay_pp_cfg.igc_cfg.cfg_payload = (void *)((unsigned long)ov +
sizeof(struct mdp_overlay));
ov->overlay_pp_cfg.pa_v2_cfg_data.cfg_payload =
ov->overlay_pp_cfg.igc_cfg.cfg_payload +
sizeof(struct mdp_igc_lut_data_v1_7);
ov->overlay_pp_cfg.pcc_cfg_data.cfg_payload =
ov->overlay_pp_cfg.pa_v2_cfg_data.cfg_payload +
sizeof(struct mdp_pa_data_v1_7);
return 0;
}
int mdss_compat_overlay_ioctl(struct fb_info *info, unsigned int cmd,
unsigned long arg)
{
@ -3365,6 +3392,7 @@ int mdss_compat_overlay_ioctl(struct fb_info *info, unsigned int cmd,
size_t layers_refs_sz, layers_sz, prepare_sz;
void __user *total_mem_chunk;
uint32_t num_overlays;
uint32_t alloc_size = 0;
int ret;
if (!info || !info->par)
@ -3381,13 +3409,19 @@ int mdss_compat_overlay_ioctl(struct fb_info *info, unsigned int cmd,
ret = mdss_histo_compat_ioctl(info, cmd, arg);
break;
case MSMFB_OVERLAY_GET:
ov = compat_alloc_user_space(sizeof(*ov));
alloc_size += sizeof(*ov) + __pp_sspp_size();
ov = compat_alloc_user_space(alloc_size);
if (!ov) {
pr_err("%s:%u: compat alloc error [%zu] bytes\n",
__func__, __LINE__, sizeof(*ov));
return -EINVAL;
}
ov32 = compat_ptr(arg);
ret = __pp_sspp_set_offsets(ov);
if (ret) {
pr_err("setting the pp offsets failed ret %d\n", ret);
return ret;
}
ret = __from_user_mdp_overlay(ov, ov32);
if (ret)
pr_err("%s: compat mdp overlay failed\n", __func__);
@ -3396,12 +3430,18 @@ int mdss_compat_overlay_ioctl(struct fb_info *info, unsigned int cmd,
ret = __to_user_mdp_overlay(ov32, ov);
break;
case MSMFB_OVERLAY_SET:
ov = compat_alloc_user_space(sizeof(*ov));
alloc_size += sizeof(*ov) + __pp_sspp_size();
ov = compat_alloc_user_space(alloc_size);
if (!ov) {
pr_err("%s:%u: compat alloc error [%zu] bytes\n",
__func__, __LINE__, sizeof(*ov));
return -EINVAL;
}
ret = __pp_sspp_set_offsets(ov);
if (ret) {
pr_err("setting the pp offsets failed ret %d\n", ret);
return ret;
}
ov32 = compat_ptr(arg);
ret = __from_user_mdp_overlay(ov, ov32);
if (ret) {

2
drivers/video/fbdev/msm/mdss_compat_utils.h
View file

@ -423,6 +423,8 @@ struct mdp_overlay_pp_params32 {
struct mdp_sharp_cfg32 sharp_cfg;
struct mdp_histogram_cfg32 hist_cfg;
struct mdp_hist_lut_data32 hist_lut_cfg;
struct mdp_pa_v2_cfg_data32 pa_v2_cfg_data;
struct mdp_pcc_cfg_data32 pcc_cfg_data;
};
struct msmfb_mdp_pp32 {