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

Merge "drm/msm/sde:: fix optional property parsing for qseed and csc properties"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-17 07:33:04 -08:00 • committed by Gerrit - the friendly Code Review server
commit c82e967d8a
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/gpu/drm/msm/sde/sde_hw_catalog.c
View file

@ -1830,12 +1830,20 @@ static int sde_parse_dt(struct device_node *np, struct sde_mdss_cfg *cfg)
cfg->qseed_type = SDE_SSPP_SCALER_QSEED3; cfg->qseed_type = SDE_SSPP_SCALER_QSEED3;
else if (!rc && !strcmp(type, "qseedv2")) else if (!rc && !strcmp(type, "qseedv2"))
cfg->qseed_type = SDE_SSPP_SCALER_QSEED2; cfg->qseed_type = SDE_SSPP_SCALER_QSEED2;
else if (rc) {
SDE_DEBUG("qseed property not found\n");
rc = 0;
}
rc = of_property_read_string(np, sde_prop[CSC_TYPE].prop_name, &type); rc = of_property_read_string(np, sde_prop[CSC_TYPE].prop_name, &type);
if (!rc && !strcmp(type, "csc")) if (!rc && !strcmp(type, "csc"))
cfg->csc_type = SDE_SSPP_CSC; cfg->csc_type = SDE_SSPP_CSC;
else if (!rc && !strcmp(type, "csc-10bit")) else if (!rc && !strcmp(type, "csc-10bit"))
cfg->csc_type = SDE_SSPP_CSC_10BIT; cfg->csc_type = SDE_SSPP_CSC_10BIT;
else if (rc) {
SDE_DEBUG("CSC property not found\n");
rc = 0;
}
cfg->has_src_split = PROP_VALUE_ACCESS(prop_value, SRC_SPLIT, 0); cfg->has_src_split = PROP_VALUE_ACCESS(prop_value, SRC_SPLIT, 0);
end: end: