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

Merge "msm: mdss: add additional LM checks for dest scalar validation"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-26 14:48:44 -07:00 • committed by Gerrit - the friendly Code Review server
commit 01e1d840d7
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/video/fbdev/msm/mdss_mdp_layer.c
View file

@ -137,8 +137,12 @@ static int mdss_mdp_destination_scaler_pre_validate(struct mdss_mdp_ctl *ctl,
if ((ds_data->lm_width > get_panel_xres(pinfo)) ||
(ds_data->lm_height > get_panel_yres(pinfo)) ||
(ds_data->lm_width == 0) ||
(ds_data->lm_height == 0)) {
pr_err("Invalid LM width / height setting\n");
(ds_data->lm_height == 0) ||
(is_dsc_compression(pinfo) &&
!is_lm_configs_dsc_compatible(pinfo,
ds_data->lm_width, ds_data->lm_height))) {
pr_err("Invalid left LM {%d,%d} setting\n",
ds_data->lm_width, ds_data->lm_height);
return -EINVAL;
}
@ -163,8 +167,12 @@ static int mdss_mdp_destination_scaler_pre_validate(struct mdss_mdp_ctl *ctl,
if ((ds_data->lm_width > get_panel_xres(pinfo)) ||
(ds_data->lm_height > get_panel_yres(pinfo)) ||
(ds_data->lm_width == 0) ||
(ds_data->lm_height == 0)) {
pr_err("Invalid LM width / height setting\n");
(ds_data->lm_height == 0) ||
(is_dsc_compression(pinfo) &&
!is_lm_configs_dsc_compatible(pinfo,
ds_data->lm_width, ds_data->lm_height))) {
pr_err("Invalid right LM {%d,%d} setting\n",
ds_data->lm_width, ds_data->lm_height);
return -EINVAL;
}
@ -174,7 +182,7 @@ static int mdss_mdp_destination_scaler_pre_validate(struct mdss_mdp_ctl *ctl,
*/
ctl->mixer_right->width = ds_data->lm_width;
ctl->mixer_right->height = ds_data->lm_height;
pr_info("Update mixer-right width/height: %dx%d\n",
pr_debug("Update mixer-right width/height: %dx%d\n",
ds_data->lm_width, ds_data->lm_height);
if (ctl->mixer_left &&

9
drivers/video/fbdev/msm/mdss_panel.h
View file

@ -900,6 +900,15 @@ static inline bool is_dsc_compression(struct mdss_panel_info *pinfo)
return false;
}
static inline bool is_lm_configs_dsc_compatible(struct mdss_panel_info *pinfo,
u32 width, u32 height)
{
if ((width % pinfo->dsc.slice_width) ||
(height % pinfo->dsc.slice_height))
return false;
return true;
}
int mdss_register_panel(struct platform_device *pdev,
struct mdss_panel_data *pdata);